Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp

Issue 1755273002: Fix parsing of object numbers > 16,777,216. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase to master Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/include/fpdfapi/fpdf_parser.h" 7 #include "core/include/fpdfapi/fpdf_parser.h"
8 8
9 #include "core/include/fpdfapi/fpdf_serial.h" 9 #include "core/include/fpdfapi/fpdf_serial.h"
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) { 45 void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
46 m_pFile = pFile; 46 m_pFile = pFile;
47 m_bOwnFile = bOwnFile; 47 m_bOwnFile = bOwnFile;
48 CPDF_SyntaxParser parser; 48 CPDF_SyntaxParser parser;
49 parser.InitParser(m_pFile, 0); 49 parser.InitParser(m_pFile, 0);
50 while (1) { 50 while (1) {
51 bool bNumber; 51 bool bNumber;
52 CFX_ByteString word = parser.GetNextWord(&bNumber); 52 CFX_ByteString word = parser.GetNextWord(&bNumber);
53 if (bNumber) { 53 if (bNumber) {
54 FX_DWORD objnum = FXSYS_atoi(word); 54 FX_DWORD objnum = FXSYS_atoui(word);
55 word = parser.GetNextWord(&bNumber); 55 word = parser.GetNextWord(&bNumber);
56 if (!bNumber) { 56 if (!bNumber) {
57 break; 57 break;
58 } 58 }
59 word = parser.GetNextWord(nullptr); 59 word = parser.GetNextWord(nullptr);
60 if (word != "obj") { 60 if (word != "obj") {
61 break; 61 break;
62 } 62 }
63 CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true); 63 CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true);
64 if (!pObj) { 64 if (!pObj) {
(...skipping 22 matching lines...) Expand all
87 return FALSE; 87 return FALSE;
88 } 88 }
89 buf << "%FDF-1.2\r\n"; 89 buf << "%FDF-1.2\r\n";
90 for (const auto& pair : m_IndirectObjs) { 90 for (const auto& pair : m_IndirectObjs) {
91 buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n"; 91 buf << pair.first << " 0 obj\r\n" << pair.second << "\r\nendobj\r\n\r\n";
92 } 92 }
93 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 93 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
94 << " 0 R>>\r\n%%EOF\r\n"; 94 << " 0 R>>\r\n%%EOF\r\n";
95 return TRUE; 95 return TRUE;
96 } 96 }
OLDNEW
« no previous file with comments | « core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp ('k') | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698