Merge to XFA: Cleanup: Remove some NULL checks in fpdfsdk.

fpdfsdk/src/javascript/PublicMethods.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 "PublicMethods.h"
 
 #include "../../include/fsdk_mgr.h"  // For CPDFDoc_Environment.
 #include "../../include/javascript/IJavaScript.h"
@@ skipping 340 matching lines @@
   }
   CFX_WideString wsStr = val.ToCFXWideString();
   CFX_ByteString t = CFX_ByteString::FromUnicode(wsStr);
   const char* p = (const char*)t;
 
   int ch = ',';
   int nIndex = 0;
 
   while (*p) {
     const char* pTemp = strchr(p, ch);
-    if (pTemp == NULL) {
+    if (!pTemp) {
       StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(p).c_str()));
       break;
-    } else {
-      char* pSub = new char[pTemp - p + 1];
-      strncpy(pSub, p, pTemp - p);
-      *(pSub + (pTemp - p)) = '\0';
+    }
 
-      StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(pSub).c_str()));
-      delete[] pSub;
+    char* pSub = new char[pTemp - p + 1];
+    strncpy(pSub, p, pTemp - p);
+    *(pSub + (pTemp - p)) = '\0';
 
-      nIndex++;
-      p = ++pTemp;
-    }
+    StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(pSub).c_str()));
+    delete[] pSub;
+
+    nIndex++;
+    p = ++pTemp;
   }
   return StrArray;
 }
 
 int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& string,
                                           int nStart,
                                           int& nSkip,
                                           int nMaxStep) {
   int nRet = 0;
   nSkip = 0;
@@ skipping 1404 matching lines @@
   ASSERT(pContext != NULL);
   CJS_EventHandler* pEventHandler = pContext->GetEventHandler();
   ASSERT(pEventHandler != NULL);
 
   if (params.size() != 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   CFX_WideString swValue;
-  if (pEventHandler->m_pValue != NULL)
+  if (pEventHandler->m_pValue)
     swValue = pEventHandler->Value();
 
   if (pEventHandler->WillCommit()) {
     vRet = swValue.c_str();
     return TRUE;
   }
 
   CFX_WideString prefix, postfix;
 
   if (pEventHandler->SelStart() >= 0)
@@ skipping 259 matching lines @@
     nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }