commit 389b6ba9158afe9143997bb09d514541d4cee363
author Tom Sepez <tsepez@chromium.org> Fri Apr 23 23:49:10 2021 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Apr 23 23:49:10 2021 +0000
tree 1c052cad245dc6ba6e5c5a845f8f0e62596a29b8
parent 439f16920c1b6a39c9bbe152350867c1191859bf

Avoid logical operations with {Byte,Wide}String::Compare()

The code is correct, but it is too easy to get this wrong when
mapping the expected 1/0/-1 result into a bool, so use explicit
comparisons against 0.

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

fpdfsdk/fpdf_editpage.cpp

diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 8441c09..7c7f2c6 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -64,7 +64,7 @@
     return false;
 
   const CPDF_Object* pObject = pFormDict->GetObjectFor("Type")->GetDirect();
-  return pObject && !pObject->GetString().Compare("Page");
+  return pObject && pObject->GetString().Compare("Page") == 0;
 }
 
 void CalcBoundingBox(CPDF_PageObject* pPageObj) {

fpdfsdk/fpdf_ppo.cpp

diff --git a/fpdfsdk/fpdf_ppo.cpp b/fpdfsdk/fpdf_ppo.cpp
index 5c0fa6f..554c210 100644
--- a/fpdfsdk/fpdf_ppo.cpp
+++ b/fpdfsdk/fpdf_ppo.cpp
@@ -150,7 +150,7 @@
       pDict->GetObjectFor(pdfium::page_object::kType)->GetDirect();
   if (!ToName(pType))
     return nullptr;
-  if (pType->GetString().Compare("Page"))
+  if (pType->GetString().Compare("Page") != 0)
     return nullptr;
 
   const CPDF_Dictionary* pp = ToDictionary(

xfa/fxfa/fm2js/cxfa_fmexpression.cpp

diff --git a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
index c1462ac..92880c0 100644
--- a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
@@ -450,7 +450,7 @@
         return val.Compare(iter.m_wsSomMethodName) > 0;
       });
   if (result != std::end(gs_FMSomMethods) &&
-      !methodName.Compare(result->m_wsSomMethodName)) {
+      methodName.Compare(result->m_wsSomMethodName) == 0) {
     return result->m_dParameters;
   }
   return 0;