Get rid of most instance of 'foo != NULL'

core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfapi/fpdf_parser.h"
 
 #include "core/include/fxcrt/fx_string.h"
 
@@ skipping 143 matching lines @@
       return nullptr;
   }
 }
 
 CPDF_Array* CPDF_Object::GetArray() const {
   // The method should be made non-const if we want to not be const.
   // See bug #234.
   return const_cast<CPDF_Array*>(AsArray());
 }
 void CPDF_Object::SetString(const CFX_ByteString& str) {
-  ASSERT(this != NULL);
+  ASSERT(this);

[Tom Sepez, 2015/12/14 19:14:07]

Uh, no.

[Lei Zhang, 2015/12/15 01:38:32]

Done.

   switch (m_Type) {
     case PDFOBJ_BOOLEAN:
       AsBoolean()->m_bValue = (str == "true");
       return;
     case PDFOBJ_NUMBER:
       AsNumber()->SetString(str);
       return;
     case PDFOBJ_STRING:
       AsString()->m_String = str;
       return;
@@ skipping 344 matching lines @@
     pOld->Release();
   if (pObj->GetObjNum()) {
     ASSERT(pObjs);
     pObj = new CPDF_Reference(pObjs, pObj->GetObjNum());
   }
   m_Objects.SetAt(i, pObj);
 }
 void CPDF_Array::InsertAt(FX_DWORD index,
                           CPDF_Object* pObj,
                           CPDF_IndirectObjects* pObjs) {
-  ASSERT(pObj != NULL);
   if (pObj->GetObjNum()) {
-    ASSERT(pObjs != NULL);
+    ASSERT(pObjs);

[Tom Sepez, 2015/12/14 19:14:08]

Probably segvs under next line?  Or is it special cased in CPDF_Reference()?

[Lei Zhang, 2015/12/15 01:38:32]

The next line dereferences |pObj| but not |pObjs|.

     pObj = new CPDF_Reference(pObjs, pObj->GetObjNum());
   }
   m_Objects.InsertAt(index, pObj);
 }
 void CPDF_Array::Add(CPDF_Object* pObj, CPDF_IndirectObjects* pObjs) {
-  ASSERT(pObj != NULL);
   if (pObj->GetObjNum()) {
-    ASSERT(pObjs != NULL);
+    ASSERT(pObjs);

[Tom Sepez, 2015/12/14 19:14:07]

and here.

[Lei Zhang, 2015/12/15 01:38:32]

Same as above.

     pObj = new CPDF_Reference(pObjs, pObj->GetObjNum());
   }
   m_Objects.Add(pObj);
 }
 void CPDF_Array::AddName(const CFX_ByteString& str) {
   ASSERT(IsArray());
   Add(new CPDF_Name(str));
 }
 void CPDF_Array::AddString(const CFX_ByteString& str) {
   ASSERT(IsArray());
@@ skipping 622 matching lines @@
   }
   pObj->m_ObjNum = objnum;
   m_IndirectObjs.SetAt((void*)(uintptr_t)objnum, pObj);
   if (m_LastObjNum < objnum) {
     m_LastObjNum = objnum;
   }
 }
 FX_DWORD CPDF_IndirectObjects::GetLastObjNum() const {
   return m_LastObjNum;
 }