summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorWei Li <weili@chromium.org>2017-03-23 09:45:04 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-03-23 17:05:05 +0000
commit6bdd824188bc9a2e6b24b5752a3170ce10185c1d (patch)
tree272c426e10e66315ef2993d2d8712029aa6a90b5 /testing
parent409b663d532d4d6f09a1188fa3b9ac4044708bc4 (diff)
downloadpdfium-6bdd824188bc9a2e6b24b5752a3170ce10185c1d.tar.xz
Fix two CloneNonCycle issues
CloneNonCycle() tries to detect cyclic object references without copying them. There are two issues: -- for elements in an array or a dictionary, they should be able to refer to the same object, which are not cyclic; -- for cyclic referenced elements in an array or a dictionary, do not clone the element at all. Having nullptr or <key, nullptr> as an element, like we did before, might cause crash when the element being accessed. BUG=chromium:701860 Change-Id: Id0304accde76ed06fa5ce640994c7628359600fb Reviewed-on: https://pdfium-review.googlesource.com/3156 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'testing')
-rw-r--r--testing/resources/circular_viewer_ref.in24
-rw-r--r--testing/resources/circular_viewer_ref.pdf35
-rw-r--r--testing/resources/repeat_viewer_ref.in19
-rw-r--r--testing/resources/repeat_viewer_ref.pdf30
4 files changed, 108 insertions, 0 deletions
diff --git a/testing/resources/circular_viewer_ref.in b/testing/resources/circular_viewer_ref.in
new file mode 100644
index 0000000000..f791607e91
--- /dev/null
+++ b/testing/resources/circular_viewer_ref.in
@@ -0,0 +1,24 @@
+{{header}}
+{{object 1 0}}
+<</Names 1 0 R
+ /ViewerPreferences<<
+ /Names 1 0 R
+ /ViewerPreferences<<
+ /Names 1 0 R
+ /ViewerPreferences<<>>
+ >>>>
+>>
+endobj
+
+{{object 2 0}}
+<</Names[(0) 7 0 R]>>
+endobj
+
+{{object 7 0}}
+<</JS(this.print\({bUI:true,bSilent:false,bShrinkToFit:true}\);)/S/JavaScript>>
+endobj
+
+{{xref}}
+trailer <</Root 1 0 R>>
+{{startxref}}
+%%EOF
diff --git a/testing/resources/circular_viewer_ref.pdf b/testing/resources/circular_viewer_ref.pdf
new file mode 100644
index 0000000000..2e5c4dd8ab
--- /dev/null
+++ b/testing/resources/circular_viewer_ref.pdf
@@ -0,0 +1,35 @@
+%PDF-1.7
+% ò¤ô
+1 0 obj
+<</Names 1 0 R
+ /ViewerPreferences<<
+ /Names 1 0 R
+ /ViewerPreferences<<
+ /Names 1 0 R
+ /ViewerPreferences<<>>
+ >>>>
+>>
+endobj
+
+2 0 obj
+<</Names[(0) 7 0 R]>>
+endobj
+
+7 0 obj
+<</JS(this.print\({bUI:true,bSilent:false,bShrinkToFit:true}\);)/S/JavaScript>>
+endobj
+
+xref
+0 8
+0000000000 65535 f
+0000000015 00000 n
+0000000157 00000 n
+0000000000 65535 f
+0000000000 65535 f
+0000000000 65535 f
+0000000000 65535 f
+0000000195 00000 n
+trailer <</Root 1 0 R>>
+startxref
+291
+%%EOF
diff --git a/testing/resources/repeat_viewer_ref.in b/testing/resources/repeat_viewer_ref.in
new file mode 100644
index 0000000000..6b436e535f
--- /dev/null
+++ b/testing/resources/repeat_viewer_ref.in
@@ -0,0 +1,19 @@
+{{header}}
+{{object 1 0}}
+<</Names<</JavaScript 2 0 R>>/ViewerPreferences<<
+<</Names<</JavaScript 2 0 R>>/ViewerPreferences<<
+<</Names<</JavaScript 2 0 R>>/ViewerPreferences<<>>
+endobj
+
+{{object 2 0}}
+<</Names[(0) 7 0 R]>>
+endobj
+
+{{object 7 0}}
+<</JS(this.print\({bUI:true,bSilent:false,bShrinkToFit:true}\);)/S/JavaScript>>
+endobj
+
+{{xref}}
+trailer <</Root 1 0 R>>
+{{startxref}}
+%%EOF
diff --git a/testing/resources/repeat_viewer_ref.pdf b/testing/resources/repeat_viewer_ref.pdf
new file mode 100644
index 0000000000..3f4ee47724
--- /dev/null
+++ b/testing/resources/repeat_viewer_ref.pdf
@@ -0,0 +1,30 @@
+%PDF-1.7
+% ò¤ô
+1 0 obj
+<</Names<</JavaScript 2 0 R>>/ViewerPreferences<<
+<</Names<</JavaScript 2 0 R>>/ViewerPreferences<<
+<</Names<</JavaScript 2 0 R>>/ViewerPreferences<<>>
+endobj
+
+2 0 obj
+<</Names[(0) 7 0 R]>>
+endobj
+
+7 0 obj
+<</JS(this.print\({bUI:true,bSilent:false,bShrinkToFit:true}\);)/S/JavaScript>>
+endobj
+
+xref
+0 8
+0000000000 65535 f
+0000000015 00000 n
+0000000183 00000 n
+0000000000 65535 f
+0000000000 65535 f
+0000000000 65535 f
+0000000000 65535 f
+0000000221 00000 n
+trailer <</Root 1 0 R>>
+startxref
+317
+%%EOF