summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD.gn1
-rw-r--r--pdfium.gyp1
-rw-r--r--testing/resources/bug_216.in39
-rw-r--r--testing/resources/bug_216.pdf40
-rw-r--r--xfa/src/fxfa/src/parser/xfa_parser_imp.cpp39
-rw-r--r--xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp15
6 files changed, 13 insertions, 122 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 8f8b90332f..5657296bc9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1511,7 +1511,6 @@ test("pdfium_embeddertests") {
"testing/embedder_test.h",
"testing/embedder_test_mock_delegate.h",
"testing/embedder_test_timer_handling_delegate.h",
- "xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp",
]
deps = [
"//testing/gmock",
diff --git a/pdfium.gyp b/pdfium.gyp
index 22d6304302..b101096439 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -806,7 +806,6 @@
'testing/embedder_test.h',
'testing/embedder_test_mock_delegate.h',
'testing/embedder_test_timer_handling_delegate.h',
- 'xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp',
],
'conditions': [
['pdf_enable_v8==1', {
diff --git a/testing/resources/bug_216.in b/testing/resources/bug_216.in
deleted file mode 100644
index 1ecd862c17..0000000000
--- a/testing/resources/bug_216.in
+++ /dev/null
@@ -1,39 +0,0 @@
-{{header}}
-{{object 1 0}} <<
- /Type /Catalog
- /Pages 2 0 R
- /AcroForm 4 0 R
->>
-endobj
-{{object 2 0}} <<
- /Type /Pages
- /Count 1
->>
-endobj
-{{object 4 0}} <<
- /XFA [
- (xdp:xdp) 23 0 R
- (form) 29 0 R
- (</xdp:xdp>) 30 0 R]
->>
-endobj
-{{object 23 0}} <<
->>stream
-<?xml version="1.0" encoding="UTF-8"?>
-<xdp:xdp xmlns:xdp="http://www.foxitsoftware.com/">
-endstream
-endobj
-{{object 29 0}} <<
->>stream
-<form xmlns="http://www.xfa.org/schema/xfa-form/2.6/">
-</form>
-endstream
-endobj
-{{object 30 0}} <<
->>stream
-</xdp:xdp>
-endstream
-endobj
-trailer
-<</Root 1 0 R>>
-%%EOF
diff --git a/testing/resources/bug_216.pdf b/testing/resources/bug_216.pdf
deleted file mode 100644
index 2d5987277f..0000000000
--- a/testing/resources/bug_216.pdf
+++ /dev/null
@@ -1,40 +0,0 @@
-%PDF-1.7
-% ò¤ô
-1 0 obj <<
- /Type /Catalog
- /Pages 2 0 R
- /AcroForm 4 0 R
->>
-endobj
-2 0 obj <<
- /Type /Pages
- /Count 1
->>
-endobj
-4 0 obj <<
- /XFA [
- (xdp:xdp) 23 0 R
- (form) 29 0 R
- (</xdp:xdp>) 30 0 R]
->>
-endobj
-23 0 obj <<
->>stream
-<?xml version="1.0" encoding="UTF-8"?>
-<xdp:xdp xmlns:xdp="http://www.foxitsoftware.com/">
-endstream
-endobj
-29 0 obj <<
->>stream
-<form xmlns="http://www.xfa.org/schema/xfa-form/2.6/">
-</form>
-endstream
-endobj
-30 0 obj <<
->>stream
-</xdp:xdp>
-endstream
-endobj
-trailer
-<</Root 1 0 R>>
-%%EOF
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
index 48547d7e9f..9e85c1f539 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
@@ -386,12 +386,12 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PACKET_XDP)->pName,
XFA_GetPacketByIndex(XFA_PACKET_XDP)->pURI,
XFA_GetPacketByIndex(XFA_PACKET_XDP)->eFlags)) {
- return nullptr;
+ return NULL;
}
CXFA_Node* pXFARootNode =
m_pFactory->CreateNode(XFA_XDPPACKET_XDP, XFA_ELEMENT_Xfa);
if (!pXFARootNode) {
- return nullptr;
+ return NULL;
}
m_pRootNode = pXFARootNode;
pXFARootNode->SetCData(XFA_ATTRIBUTE_Name, FX_WSTRC(L"xfa"));
@@ -408,8 +408,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
}
}
}
- IFDE_XMLNode* pXMLConfigDOMRoot = nullptr;
- CXFA_Node* pXFAConfigDOMRoot = nullptr;
+ IFDE_XMLNode* pXMLConfigDOMRoot = NULL;
+ CXFA_Node* pXFAConfigDOMRoot = NULL;
{
for (IFDE_XMLNode* pChildItem =
pXMLDocumentNode->GetNodeItem(IFDE_XMLNode::FirstChild);
@@ -423,7 +423,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
}
if (CXFA_Node* pChildNode =
pXFARootNode->GetFirstChildByName(pPacketInfo->uHash)) {
- return nullptr;
+ return NULL;
}
pXMLConfigDOMRoot = pChildItem;
pXFAConfigDOMRoot =
@@ -431,9 +431,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
pXFARootNode->InsertChild(pXFAConfigDOMRoot, NULL);
}
}
- IFDE_XMLNode* pXMLDatasetsDOMRoot = nullptr;
- IFDE_XMLNode* pXMLFormDOMRoot = nullptr;
- IFDE_XMLNode* pXMLTemplateDOMRoot = nullptr;
+ IFDE_XMLNode* pXMLDatasetsDOMRoot = NULL;
+ IFDE_XMLNode* pXMLFormDOMRoot = NULL;
{
for (IFDE_XMLNode* pChildItem =
pXMLDocumentNode->GetNodeItem(IFDE_XMLNode::FirstChild);
@@ -454,7 +453,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
if (!XFA_FDEExtension_MatchNodeName(pElement, pPacketInfo->pName,
pPacketInfo->pURI,
pPacketInfo->eFlags)) {
- pPacketInfo = nullptr;
+ pPacketInfo = NULL;
}
}
XFA_XDPPACKET ePacket =
@@ -464,41 +463,29 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
}
if (ePacket == XFA_XDPPACKET_Datasets) {
if (pXMLDatasetsDOMRoot) {
- return nullptr;
+ pXMLDatasetsDOMRoot = NULL;
+ return NULL;
}
pXMLDatasetsDOMRoot = pElement;
} else if (ePacket == XFA_XDPPACKET_Form) {
if (pXMLFormDOMRoot) {
- return nullptr;
+ pXMLFormDOMRoot = NULL;
+ return NULL;
}
pXMLFormDOMRoot = pElement;
- } else if (ePacket == XFA_XDPPACKET_Template) {
- if (pXMLTemplateDOMRoot) {
- // Found a duplicate template packet.
- return nullptr;
- }
- CXFA_Node* pPacketNode = ParseAsXDPPacket(pElement, ePacket);
- if (pPacketNode) {
- pXMLTemplateDOMRoot = pElement;
- pXFARootNode->InsertChild(pPacketNode);
- }
} else {
CXFA_Node* pPacketNode = ParseAsXDPPacket(pElement, ePacket);
if (pPacketNode) {
if (pPacketInfo &&
(pPacketInfo->eFlags & XFA_XDPPACKET_FLAGS_SUPPORTONE) &&
pXFARootNode->GetFirstChildByName(pPacketInfo->uHash)) {
- return nullptr;
+ return NULL;
}
pXFARootNode->InsertChild(pPacketNode);
}
}
}
}
- if (!pXMLTemplateDOMRoot) {
- // No template is found.
- return nullptr;
- }
if (pXMLDatasetsDOMRoot) {
CXFA_Node* pPacketNode =
ParseAsXDPPacket(pXMLDatasetsDOMRoot, XFA_XDPPACKET_Datasets);
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp
deleted file mode 100644
index 5a3059c0f5..0000000000
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp_embeddertest.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2015 PDFium 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 "../../../../../testing/embedder_test.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-class XFAParserImpEmbeddertest : public EmbedderTest {};
-
-TEST_F(XFAParserImpEmbeddertest, Bug_216) {
- EXPECT_TRUE(OpenDocument("testing/resources/bug_216.pdf"));
- FPDF_PAGE page = LoadPage(0);
- EXPECT_NE(nullptr, page);
- UnloadPage(page);
-} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 21:50:02 +0000