diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 21:17:01 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 21:17:01 -0800 |
| commit | 7336f95447e30a27771ce773d87997844ff4b509 (patch) | |
| tree | f8e4ed605f2e64e6f9d12e254c3703c2b0254eab | |
| parent | fcfa3b828b92013a45c6bc6d44b04f42a912eff7 (diff) | |
| download | pdfium-7336f95447e30a27771ce773d87997844ff4b509.tar.xz | |
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 .
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 6 |
1 files 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; |