Get rid of NULLs in xfa/

xfa/fxjse/dynprop.cpp

Index: xfa/fxjse/dynprop.cpp
diff --git a/xfa/fxjse/dynprop.cpp b/xfa/fxjse/dynprop.cpp
index 946fe42c1b5c1cd50371d06314cbf68e697b12f8..7dbc174a1ac8d863594d3bd6426678cfc5f89a65 100644
--- a/xfa/fxjse/dynprop.cpp
+++ b/xfa/fxjse/dynprop.cpp
@@ -33,11 +33,10 @@ 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);
@@ -68,11 +67,10 @@ 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);
@@ -83,11 +81,10 @@ static void FXJSE_DynPropSetterAdapter(const FXJSE_CLASS_DESCRIPTOR* lpClass,
 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;
 }
 
@@ -95,19 +92,15 @@ 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(