From 7336f95447e30a27771ce773d87997844ff4b509 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Dec 2015 21:17:01 -0800 Subject: Merge to XFA: Fix another regression from commit f6dafc9. TBR=weili@chromium.org Review URL: https://codereview.chromium.org/1548963004 . (cherry picked from commit b43b8859153e129053f3fa790c182fa04c3336db) Review URL: https://codereview.chromium.org/1549963002 . --- core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 1115a1e560..c6e48e74a2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -2975,10 +2975,10 @@ FX_DWORD CPDF_DataAvail::GetObjectSize(FX_DWORD objnum, FX_FILESIZE& offset) { if (!pParser || !pParser->IsValidObjectNumber(objnum)) return 0; - if (pParser->m_V5Type[objnum] == 2) { + if (pParser->m_V5Type[objnum] == 2) objnum = pParser->m_ObjectInfo[objnum].pos; - } else if (pParser->m_V5Type[objnum] == 1 || - pParser->m_V5Type[objnum] == 255) { + + if (pParser->m_V5Type[objnum] == 1 || pParser->m_V5Type[objnum] == 255) { offset = pParser->m_ObjectInfo[objnum].pos; if (offset == 0) { return 0; -- cgit v1.2.3