PDF: Fix another case of circular references with bookmarks.

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 
+#include <set>
+
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 405 matching lines @@
     int page_index = FPDFDest_GetPageIndex(doc, dest);
     dict.Set(pp::Var("page"), pp::Var(page_index));
   }
 
   pp::VarArray children;
 
   // Don't trust PDFium to handle circular bookmarks.
   const unsigned int kMaxDepth = 128;
   if (depth < kMaxDepth) {
     int child_index = 0;
+    std::set<FPDF_BOOKMARK> seen_bookmarks;
     for (FPDF_BOOKMARK child_bookmark =
              FPDFBookmark_GetFirstChild(doc, bookmark);
-         child_bookmark != NULL;
+         child_bookmark != nullptr;

[Tom Sepez, 2016/01/04 18:59:22]

nit: just child_bookmark;

[Lei Zhang, 2016/01/04 21:44:43]

Done.

          child_bookmark = FPDFBookmark_GetNextSibling(doc, child_bookmark)) {
+      if (ContainsKey(seen_bookmarks, child_bookmark))
+        break;
+
+      seen_bookmarks.insert(child_bookmark);
       children.Set(child_index,
                    TraverseBookmarks(doc, child_bookmark, depth + 1));
       child_index++;
     }
   }
   dict.Set(pp::Var("children"), children);
   return dict;
 }
 
 std::string GetDocumentMetadata(FPDF_DOCUMENT doc, const std::string& key) {
@@ skipping 3558 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf