summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2015-10-28 13:32:35 -0400
committerDan Sinclair <dsinclair@chromium.org>2015-10-28 13:32:35 -0400
commitdd4cd523ef4546b43d68e8ca6ec0a97fbe8954e9 (patch)
treedc4465dea283ad6b3b48625ff348f7ccabc05e31 /testing
parentb9d06fb2186d7002d6231d1805bcf97fc60144c5 (diff)
downloadpdfium-dd4cd523ef4546b43d68e8ca6ec0a97fbe8954e9.tar.xz
Check if document was opened during testing.
When we call OpenDocument we fail to check if the document was actually opened. Currently we return true in all cases (assuming we read the file). This CL updates the code to check if the document was opened and return false if not. I've updated several tests to check for FALSE instead of TRUE. I verified the documents in fact don't open with my local (non-PDFium) PDF reader. BUG=pdfium:223 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1417893007 .
Diffstat (limited to 'testing')
-rw-r--r--testing/embedder_test.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index 723bad7f8a..b474955566 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -93,9 +93,8 @@ void EmbedderTest::TearDown() {
bool EmbedderTest::OpenDocument(const std::string& filename) {
file_contents_ = GetFileContents(filename.c_str(), &file_length_);
- if (!file_contents_) {
+ if (!file_contents_)
return false;
- }
loader_ = new TestLoader(file_contents_, file_length_);
file_access_.m_FileLen = static_cast<unsigned long>(file_length_);
@@ -111,11 +110,13 @@ bool EmbedderTest::OpenDocument(const std::string& filename) {
avail_ = FPDFAvail_Create(&file_avail_, &file_access_);
(void)FPDFAvail_IsDocAvail(avail_, &hints_);
- if (!FPDFAvail_IsLinearized(avail_)) {
+ if (!FPDFAvail_IsLinearized(avail_))
document_ = FPDF_LoadCustomDocument(&file_access_, nullptr);
- } else {
+ else
document_ = FPDFAvail_GetDocument(avail_, nullptr);
- }
+
+ if (!document_)
+ return false;
(void)FPDF_GetDocPermissions(document_);
(void)FPDFAvail_IsFormAvail(avail_, &hints_);