From 8e3f8931c5dfb22ab3e0cf98821e2cca9369d69e Mon Sep 17 00:00:00 2001
From: Wei Li <weili@chromium.org>
Date: Fri, 8 Jan 2016 14:36:59 -0800
Subject: Merge to XFA: Fix infinite loop caused by parsing same indirect
 objects

BUG=pdfium:343
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1569343002 .

(cherry picked from commit 149f1db8bba85bdf2b40d330c38f2478695ca0d5)

Review URL: https://codereview.chromium.org/1575663002 .
---
 core/include/fpdfapi/fpdf_parser.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'core/include/fpdfapi')

diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 756850932e..e1901ebdce 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -9,6 +9,7 @@
 
 #include <map>
 #include <memory>
+#include <set>
 
 #include "core/include/fpdfapi/fpdf_objects.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -536,6 +537,9 @@ class CPDF_Parser {
   // streams in |m_ObjectStreamMap| are valid.
   std::map<CPDF_StreamAcc*, StreamObjectCache> m_ObjCache;
 
+  // All indirect object numbers that are being parsed.
+  std::set<FX_DWORD> m_ParsingObjNums;
+
   friend class CPDF_Creator;
   friend class CPDF_DataAvail;
 };
-- 
cgit v1.2.3