commit 6567213943af4fa602b096a44945c9ee16e3bcc2
author Tom Sepez <tsepez@chromium.org> Tue Nov 30 00:21:59 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 30 00:21:59 2021 +0000
tree 7ee3d147f822382d744d633810b53b6ca18e5eb3
parent 9e372dcdccdd6f2709ea5f30821b1f0faa929161

Avoid null checks immediately following CPDF_Array bounds checks.

We now insist these are redundant.

Change-Id: Id03739afef993d2e4064e7d608278a918a986c22
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/87431
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

core/fpdfapi/parser/fpdf_parser_utility.cpp

diff --git a/core/fpdfapi/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp
index 36dcc17..74bc5e5 100644
--- a/core/fpdfapi/parser/fpdf_parser_utility.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp
@@ -215,7 +215,7 @@
       buf << "[";
       for (size_t i = 0; i < p->size(); i++) {
         const CPDF_Object* pElement = p->GetObjectAt(i);
-        if (pElement && !pElement->IsInline()) {
+        if (!pElement->IsInline()) {
           buf << " " << pElement->GetObjNum() << " 0 R";
         } else {
           buf << pElement;

fpdfsdk/fpdf_ppo.cpp

diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp
index 9cfbc91..c571052 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -316,8 +316,7 @@
     case CPDF_Object::kArray: {
       CPDF_Array* pArray = pObj->AsArray();
       for (size_t i = 0; i < pArray->size(); ++i) {
-        CPDF_Object* pNextObj = pArray->GetObjectAt(i);
-        if (!pNextObj || !UpdateReference(pNextObj))
+        if (!UpdateReference(pArray->GetObjectAt(i)))
           return false;
       }
       return true;