commit 3edb80670ddd20857cfba97110f64d610a5b29eb
author Lei Zhang <thestig@chromium.org> Thu Jun 28 18:26:15 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Jun 28 18:26:15 2018 +0000
tree 8c8ba347408c894661a8dc6b72ab07d80b7b0d0c
parent 35ab1bd0328a244cc2f6dcde2822c8117738b01d

Remove redundant FPDF_PAGEOBJECT null-ness checks.

CPDFTextObjectFromFPDFPageObject() will take the FPDF_PAGEOBJECT and
performs the same check anyway.

Change-Id: I6535ab749d5a3222c6f2e6fba648f7ee515d3ddc
Reviewed-on: https://pdfium-review.googlesource.com/36372
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_edittext.cpp

diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index e339c24..3115e2a 100644
--- a/fpdfsdk/fpdf_edittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
@@ -493,7 +493,7 @@
                                                        double* d,
                                                        double* e,
                                                        double* f) {
-  if (!text || !a || !b || !c || !d || !e || !f)
+  if (!a || !b || !c || !d || !e || !f)
     return false;
 
   CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
@@ -512,14 +512,8 @@
 }
 
 FPDF_EXPORT double FPDF_CALLCONV FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT text) {
-  if (!text)
-    return 0;
-
   CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
-  if (!pTextObj)
-    return 0;
-
-  return pTextObj->GetFontSize();
+  return pTextObj ? pTextObj->GetFontSize() : 0;
 }
 
 FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font) {