Get rid of NULLs in xfa/

xfa/fxjse/dynprop.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 "xfa/fxjse/cfxjse_arguments.h"
 #include "xfa/fxjse/class.h"
 #include "xfa/fxjse/value.h"
 
@@ skipping 15 matching lines @@
   lpClass->dynMethodCall(lpThisValue.get(), szFxPropName, impl);
   if (!lpRetValue->DirectGetValue().IsEmpty()) {
     info.GetReturnValue().Set(lpRetValue->DirectGetValue());
   }
 }
 
 static void FXJSE_DynPropGetterAdapter(const FXJSE_CLASS_DESCRIPTOR* lpClass,
                                        CFXJSE_Value* pObject,
                                        const CFX_ByteStringC& szPropName,
                                        CFXJSE_Value* pValue) {
-  ASSERT(lpClass);
   int32_t nPropType =
-      lpClass->dynPropTypeGetter == nullptr
-          ? FXJSE_ClassPropType_Property
-          : lpClass->dynPropTypeGetter(pObject, szPropName, FALSE);
+      lpClass->dynPropTypeGetter
+          ? lpClass->dynPropTypeGetter(pObject, szPropName, FALSE)
+          : FXJSE_ClassPropType_Property;
   if (nPropType == FXJSE_ClassPropType_Property) {
     if (lpClass->dynPropGetter) {
       lpClass->dynPropGetter(pObject, szPropName, pValue);
     }
   } else if (nPropType == FXJSE_ClassPropType_Method) {
     if (lpClass->dynMethodCall && pValue) {
       v8::Isolate* pIsolate = pValue->GetIsolate();
       v8::HandleScope hscope(pIsolate);
       v8::Local<v8::ObjectTemplate> hCallBackInfoTemplate =
           v8::ObjectTemplate::New(pIsolate);
@@ skipping 10 matching lines @@
           pValue->GetIsolate(), FXJSE_DynPropGetterAdapter_MethodCallback,
           hCallBackInfo));
     }
   }
 }
 
 static void FXJSE_DynPropSetterAdapter(const FXJSE_CLASS_DESCRIPTOR* lpClass,
                                        CFXJSE_Value* pObject,
                                        const CFX_ByteStringC& szPropName,
                                        CFXJSE_Value* pValue) {
-  ASSERT(lpClass);
   int32_t nPropType =
-      lpClass->dynPropTypeGetter == nullptr
-          ? FXJSE_ClassPropType_Property
-          : lpClass->dynPropTypeGetter(pObject, szPropName, FALSE);
+      lpClass->dynPropTypeGetter
+          ? lpClass->dynPropTypeGetter(pObject, szPropName, FALSE)
+          : FXJSE_ClassPropType_Property;
   if (nPropType != FXJSE_ClassPropType_Method) {
     if (lpClass->dynPropSetter) {
       lpClass->dynPropSetter(pObject, szPropName, pValue);
     }
   }
 }
 
 static FX_BOOL FXJSE_DynPropQueryAdapter(const FXJSE_CLASS_DESCRIPTOR* lpClass,
                                          CFXJSE_Value* pObject,
                                          const CFX_ByteStringC& szPropName) {
-  ASSERT(lpClass);
   int32_t nPropType =
-      lpClass->dynPropTypeGetter == nullptr
-          ? FXJSE_ClassPropType_Property
-          : lpClass->dynPropTypeGetter(pObject, szPropName, TRUE);
+      lpClass->dynPropTypeGetter
+          ? lpClass->dynPropTypeGetter(pObject, szPropName, TRUE)
+          : FXJSE_ClassPropType_Property;
   return nPropType != FXJSE_ClassPropType_None;
 }
 
 static FX_BOOL FXJSE_DynPropDeleterAdapter(
     const FXJSE_CLASS_DESCRIPTOR* lpClass,
     CFXJSE_Value* pObject,
     const CFX_ByteStringC& szPropName) {
-  ASSERT(lpClass);
   int32_t nPropType =
-      lpClass->dynPropTypeGetter == nullptr
-          ? FXJSE_ClassPropType_Property
-          : lpClass->dynPropTypeGetter(pObject, szPropName, FALSE);
-  if (nPropType != FXJSE_ClassPropType_Method) {
-    if (lpClass->dynPropDeleter) {
-      return lpClass->dynPropDeleter(pObject, szPropName);
-    } else {
-      return nPropType == FXJSE_ClassPropType_Property ? FALSE : TRUE;
-    }
-  }
-  return FALSE;
+      lpClass->dynPropTypeGetter
+          ? lpClass->dynPropTypeGetter(pObject, szPropName, FALSE)
+          : FXJSE_ClassPropType_Property;
+  if (nPropType == FXJSE_ClassPropType_Method)
+    return FALSE;
+  if (lpClass->dynPropDeleter)
+    return lpClass->dynPropDeleter(pObject, szPropName);
+  return nPropType != FXJSE_ClassPropType_Property;
 }
 
 static void FXJSE_V8_GenericNamedPropertyQueryCallback(
     v8::Local<v8::Name> property,
     const v8::PropertyCallbackInfo<v8::Integer>& info) {
   v8::Local<v8::Object> thisObject = info.This();
   const FXJSE_CLASS_DESCRIPTOR* lpClass = static_cast<FXJSE_CLASS_DESCRIPTOR*>(
       info.Data().As<v8::External>()->Value());
   v8::Isolate* pIsolate = info.GetIsolate();
   v8::HandleScope scope(pIsolate);
@@ skipping 93 matching lines @@
           : 0,
       lpClassDefinition->dynPropDeleter
           ? FXJSE_V8_GenericNamedPropertyDeleterCallback
           : 0,
       FXJSE_V8_GenericNamedPropertyEnumeratorCallback,
       v8::External::New(pIsolate,
                         const_cast<FXJSE_CLASS_DESCRIPTOR*>(lpClassDefinition)),
       v8::PropertyHandlerFlags::kNonMasking);
   hObjectTemplate->SetHandler(configuration);
 }