Revert "Fix crash in CPDF_StreamContentParser::Handle_BeginImageData()"
This reverts commit 67ca3cf33eb00f5b844c47996ccaa9cd2ba1a532.
Reason for revert: Need to revert https://pdfium-review.googlesource.com/130911
Bug: 413161371
Original change's description:
> Fix crash in CPDF_StreamContentParser::Handle_BeginImageData()
>
> https://pdfium-review.googlesource.com/130911 failed to consider the
> case of the "ID" operator without a "BI" operator before it. Add a test
> case for this and ignore out of place "ID" operators.
>
> Bug: 413161371
> Change-Id: Ieaf63d00c8b20cf55b2217d092cf7efaa72568b0
> Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/131011
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Commit-Queue: Lei Zhang <thestig@chromium.org>
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 413161371
Change-Id: Ibf767f01a26a45c94a84a973b9b4f18a53c83609
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/131710
Commit-Queue: Lei Zhang <thestig@chromium.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index c2187d7..056647c 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -1028,10 +1028,6 @@
}
void CPDF_StreamContentParser::Handle_BeginImageData() {
- if (!inline_image_context_.has_value()) {
- return;
- }
-
InlineImageContext& inline_image_context = inline_image_context_.value();
CHECK_EQ(inline_image_context.state,
InlineImageContext::State::kLookingForID);
diff --git a/testing/resources/pixel/bug_413161371.in b/testing/resources/pixel/bug_413161371.in
deleted file mode 100644
index d5859c4..0000000
--- a/testing/resources/pixel/bug_413161371.in
+++ /dev/null
@@ -1,30 +0,0 @@
-{{header}}
-{{object 1 0}} <<
- /Type /Catalog
- /Pages 2 0 R
->>
-endobj
-{{object 2 0}} <<
- /Type /Pages
- /MediaBox [0 0 200 200]
- /Count 1
- /Kids [3 0 R]
->>
-endobj
-{{object 3 0}} <<
- /Type /Page
- /Parent 2 0 R
- /Contents 4 0 R
->>
-endobj
-{{object 4 0}} <<
- {{streamlen}}
->>
-stream
-ID
-endstream
-endobj
-{{xref}}
-{{trailer}}
-{{startxref}}
-%%EOF
diff --git a/testing/resources/pixel/bug_413161371_expected.pdf.0.png b/testing/resources/pixel/bug_413161371_expected.pdf.0.png
deleted file mode 100644
index f97e340..0000000
--- a/testing/resources/pixel/bug_413161371_expected.pdf.0.png
+++ /dev/null
Binary files differ
