From 6c4ca9f597ae84550e0b8a4323e44b188f9bb274 Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Thu, 5 Jul 2018 16:55:48 +0000 Subject: Delete CPDF_ContentMark::HasRef() This is called by many client to make sure CountItems() does not crash. Moving the check to CountItems() makes HasRef() unnecessary. Bug: pdfium:1037 Change-Id: I4f21f33a88c9aad54f0dae18a38b370c6ceaec80 Reviewed-on: https://pdfium-review.googlesource.com/37133 Commit-Queue: Henrique Nakashima Reviewed-by: Ryan Harrison --- fpdfsdk/fpdf_editpage.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'fpdfsdk/fpdf_editpage.cpp') diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 36853c70c6..d21b215d09 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -277,7 +277,7 @@ FPDFPageObj_CountMarks(FPDF_PAGEOBJECT page_object) { const auto& mark = CPDFPageObjectFromFPDFPageObject(page_object)->m_ContentMark; - return mark.HasRef() ? mark.CountItems() : 0; + return mark.CountItems(); } FPDF_EXPORT FPDF_PAGEOBJECTMARK FPDF_CALLCONV @@ -286,9 +286,6 @@ FPDFPageObj_GetMark(FPDF_PAGEOBJECT page_object, unsigned long index) { return nullptr; auto* mark = &CPDFPageObjectFromFPDFPageObject(page_object)->m_ContentMark; - if (!mark->HasRef()) - return nullptr; - if (index >= mark->CountItems()) return nullptr; -- cgit v1.2.3