Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
index 029913458a124178b838b74295c11516ac363d70..86ffae2f6e908e5691b2ad29333b6b7420b467cd 100644 |
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp |
@@ -2433,16 +2433,13 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, PARSE_CONTEXT |
pContext->m_DataStart = m_Pos; |
} |
- base::CheckedNumeric<FX_FILESIZE> pos = m_Pos; |
- pos += len; |
- if (pos.IsValid() && pos.ValueOrDie() < m_FileLen) { |
- m_Pos = pos.ValueOrDie(); |
- } else { |
- return NULL; |
- } |
- |
CPDF_CryptoHandler* pCryptoHandler = objnum == (FX_DWORD)m_MetadataObjnum ? NULL : m_pCryptoHandler; |
if (pCryptoHandler == NULL) { |
+ base::CheckedNumeric<FX_FILESIZE> pos = m_Pos; |
+ pos += len; |
+ if (pos.IsValid() && pos.ValueOrDie() < m_FileLen) { |
+ m_Pos = pos.ValueOrDie(); |
+ } |
GetNextWord(); |
if (m_WordSize < 9 || FXSYS_memcmp32(m_WordBuffer, "endstream", 9)) { |
m_Pos = StreamStartPos; |
@@ -2473,8 +2470,8 @@ CPDF_Stream* CPDF_SyntaxParser::ReadStream(CPDF_Dictionary* pDict, PARSE_CONTEXT |
} |
} |
} |
+ m_Pos = StreamStartPos; |
} |
- m_Pos = StreamStartPos; |
CPDF_Stream* pStream; |
#if defined(_FPDFAPI_MINI_) && !defined(_FXCORE_FEATURE_ALL_) |
pStream = FX_NEW CPDF_Stream(m_pFileAccess, pCryptoHandler, m_HeaderOffset + m_Pos, len, pDict, gennum); |