summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser
diff options
context:
space:
mode:
authorArtem Strygin <art-snake@yandex-team.ru>2018-07-12 09:18:19 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-07-12 09:18:19 +0000
commit68d04f284423414392b7176cbd74671f50bae196 (patch)
tree301549bb7b2ed8e96d5bfd8a44ff0e51c47f9676 /core/fpdfapi/parser
parentd8882193737ae167a33c1bf7a5cdb64543ad0301 (diff)
downloadpdfium-68d04f284423414392b7176cbd74671f50bae196.tar.xz
Reland "Avoid duplicate data buffering in CPDF_SyntaxParser::ReadStream()."
This is a reland of 77f15f7883638a4ced131d74c053af10a5970ce9 Original change's description: > Avoid duplicate data buffering in CPDF_SyntaxParser::ReadStream(). > > Allow sub-streams created from an IFX_SeekableReadStream to provide > stream data without copying memory. > The data will only reside in the top-level stream. > > For example: > For file > http://www.major-landrover.ru/upload/attachments/f/9/f96aab07dab04ae89c8a509ec1ef2b31.pdf > (18 Mb) > > The memory usage is reduced by ~13 Mb. > > Change-Id: I2595c014d0fbe1fdd181cc04965cfd7d901c2d88 > Reviewed-on: https://pdfium-review.googlesource.com/35930 > Commit-Queue: Art Snake <art-snake@yandex-team.ru> > Reviewed-by: dsinclair <dsinclair@chromium.org> Change-Id: I4c4d5dcf42ff44784468ac7a7c302df509fc804d Reviewed-on: https://pdfium-review.googlesource.com/37313 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Diffstat (limited to 'core/fpdfapi/parser')
-rw-r--r--core/fpdfapi/parser/cpdf_syntax_parser.cpp67
1 files changed, 58 insertions, 9 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
index ec5ac70a29..f8f36aee11 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
@@ -34,6 +34,37 @@ namespace {
enum class ReadStatus { Normal, Backslash, Octal, FinishOctal, CarriageReturn };
+class ReadableSubStream : public IFX_SeekableReadStream {
+ public:
+ ReadableSubStream(const RetainPtr<IFX_SeekableReadStream>& pFileRead,
+ FX_FILESIZE part_offset,
+ FX_FILESIZE part_size)
+ : m_pFileRead(pFileRead),
+ m_PartOffset(part_offset),
+ m_PartSize(part_size) {}
+
+ ~ReadableSubStream() override = default;
+
+ // IFX_SeekableReadStream overrides:
+ bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override {
+ FX_SAFE_FILESIZE safe_end = offset;
+ safe_end += size;
+ // Check that requested range is valid, to prevent calling of ReadBlock
+ // of original m_pFileRead with incorrect params.
+ if (!safe_end.IsValid() || safe_end.ValueOrDie() > m_PartSize)
+ return false;
+
+ return m_pFileRead->ReadBlock(buffer, m_PartOffset + offset, size);
+ }
+
+ FX_FILESIZE GetSize() override { return m_PartSize; }
+
+ private:
+ RetainPtr<IFX_SeekableReadStream> m_pFileRead;
+ FX_FILESIZE m_PartOffset;
+ FX_FILESIZE m_PartSize;
+};
+
} // namespace
// static
@@ -577,7 +608,6 @@ std::unique_ptr<CPDF_Stream> CPDF_SyntaxParser::ReadStream(
ToNextLine();
const FX_FILESIZE streamStartPos = GetPos();
- std::unique_ptr<uint8_t, FxFreeDeleter> pData;
if (len > 0) {
FX_SAFE_FILESIZE pos = GetPos();
pos += len;
@@ -585,12 +615,18 @@ std::unique_ptr<CPDF_Stream> CPDF_SyntaxParser::ReadStream(
len = -1;
}
+ RetainPtr<IFX_SeekableReadStream> data;
if (len > 0) {
- pData.reset(FX_Alloc(uint8_t, len));
- // We should try read data first to allow the Validator to request data
+ // Check data availability first to allow the Validator to request data
// smoothly, without jumps.
- if (!ReadBlock(pData.get(), len))
+ if (!GetValidator()->CheckDataRangeAndRequestIfUnavailable(
+ m_HeaderOffset + GetPos(), len)) {
return nullptr;
+ }
+
+ data = pdfium::MakeRetain<ReadableSubStream>(
+ GetValidator(), m_HeaderOffset + GetPos(), len);
+ SetPos(GetPos() + len);
}
const ByteStringView kEndStreamStr("endstream");
@@ -611,7 +647,7 @@ std::unique_ptr<CPDF_Stream> CPDF_SyntaxParser::ReadStream(
// specified length, it signals the end of stream.
if (memcmp(m_WordBuffer, kEndStreamStr.raw_str(),
kEndStreamStr.GetLength()) != 0) {
- pData.reset();
+ data.Reset();
len = -1;
SetPos(streamStartPos);
}
@@ -628,14 +664,27 @@ std::unique_ptr<CPDF_Stream> CPDF_SyntaxParser::ReadStream(
ASSERT(len >= 0);
if (len > 0) {
SetPos(streamStartPos);
- pData.reset(FX_Alloc(uint8_t, len));
- if (!ReadBlock(pData.get(), len))
+ // Check data availability first to allow the Validator to request data
+ // smoothly, without jumps.
+ if (!GetValidator()->CheckDataRangeAndRequestIfUnavailable(
+ m_HeaderOffset + GetPos(), len)) {
return nullptr;
+ }
+
+ data = pdfium::MakeRetain<ReadableSubStream>(
+ GetValidator(), m_HeaderOffset + GetPos(), len);
+ SetPos(GetPos() + len);
}
}
- auto pStream =
- pdfium::MakeUnique<CPDF_Stream>(std::move(pData), len, std::move(pDict));
+ auto pStream = pdfium::MakeUnique<CPDF_Stream>();
+ if (data) {
+ pStream->InitStreamFromFile(data, std::move(pDict));
+ } else {
+ DCHECK(!len);
+ // Empty stream
+ pStream->InitStream(nullptr, 0, std::move(pDict));
+ }
const FX_FILESIZE end_stream_offset = GetPos();
memset(m_WordBuffer, 0, kEndObjStr.GetLength() + 1);
GetNextWordInternal(nullptr);