Remove NULL in xfa/

This CL converts all NULL's to nullptr. All instances of comparison to nullptr
have been removed.

Review-Url: https://codereview.chromium.org/2095653002

7 files changed, 104 insertions, 108 deletions

diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp
index 2087cac138..834056eddd 100644
--- a/xfa/fgas/crt/fgas_codepage.cpp
+++ b/xfa/fgas/crt/fgas_codepage.cpp
@@ -272,7 +272,7 @@ const FX_STR2CPHASH g_FXCPHashTable[] = {
 };
 
 uint16_t GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength) {
-  ASSERT(pStr != NULL);
+  ASSERT(pStr);
   if (iLength < 0) {
     iLength = FXSYS_strlen(pStr);
   }
@@ -370,7 +370,7 @@ uint16_t FX_GetCodePageFromStringW(const FX_WCHAR* pStr, int32_t iLength) {
 }
 
 void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) {
-  ASSERT(pStr != NULL);
+  ASSERT(pStr);
   if (iLength < 0) {
     iLength = FXSYS_wcslen(pStr);
   }
@@ -392,7 +392,7 @@ void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) {
 }
 
 void FX_UTF16ToWChar(void* pBuffer, int32_t iLength) {
-  ASSERT(pBuffer != NULL && iLength > 0);
+  ASSERT(pBuffer && iLength > 0);
   if (sizeof(FX_WCHAR) == 2) {
     return;
   }
@@ -404,7 +404,7 @@ void FX_UTF16ToWChar(void* pBuffer, int32_t iLength) {
 }
 
 void FX_WCharToUTF16(void* pBuffer, int32_t iLength) {
-  ASSERT(pBuffer != NULL && iLength > 0);
+  ASSERT(pBuffer && iLength > 0);
   if (sizeof(FX_WCHAR) == 2) {
     return;
   }
@@ -430,7 +430,7 @@ int32_t FX_UTF8Decode(const FX_CHAR* pSrc,
                       int32_t* pSrcLen,
                       FX_WCHAR* pDst,
                       int32_t* pDstLen) {
-  if (pSrcLen == NULL || pDstLen == NULL) {
+  if (!pSrcLen || !pDstLen) {
     return -1;
   }
   int32_t iSrcLen = *pSrcLen;
@@ -439,7 +439,7 @@ int32_t FX_UTF8Decode(const FX_CHAR* pSrc,
     return 1;
   }
   int32_t iDstLen = *pDstLen;
-  FX_BOOL bValidDst = (pDst != NULL && iDstLen > 0);
+  FX_BOOL bValidDst = (pDst && iDstLen > 0);
   uint32_t dwCode = 0;
   int32_t iPending = 0;
   int32_t iSrcNum = 0, iDstNum = 0;
diff --git a/xfa/fgas/crt/fgas_stream.cpp b/xfa/fgas/crt/fgas_stream.cpp
index 458cf5edad..dd54fbed28 100644
--- a/xfa/fgas/crt/fgas_stream.cpp
+++ b/xfa/fgas/crt/fgas_stream.cpp
@@ -228,7 +228,7 @@ class CFX_Stream : public IFX_Stream {
   int32_t ReadString(FX_WCHAR* pStr,
                      int32_t iMaxLength,
                      FX_BOOL& bEOS,
-                     int32_t const* pByteSize = NULL) override;
+                     int32_t const* pByteSize = nullptr) override;
   int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) override;
   void Flush() override;
@@ -268,7 +268,7 @@ class CFX_TextStream : public IFX_Stream {
   int32_t ReadString(FX_WCHAR* pStr,
                      int32_t iMaxLength,
                      FX_BOOL& bEOS,
-                     int32_t const* pByteSize = NULL) override;
+                     int32_t const* pByteSize = nullptr) override;
   int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override;
   int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) override;
   void Flush() override;
@@ -308,7 +308,7 @@ class CFGAS_FileRead : public IFX_FileRead {
 };
 
 int32_t FileLength(FXSYS_FILE* file) {
-  ASSERT(file != NULL);
+  ASSERT(file);
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
   return _filelength(_fileno(file));
 #else
@@ -321,7 +321,7 @@ int32_t FileLength(FXSYS_FILE* file) {
 }
 
 FX_BOOL FileSetSize(FXSYS_FILE* file, int32_t size) {
-  ASSERT(file != NULL);
+  ASSERT(file);
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
   return _chsize(_fileno(file), size) == 0;
 #elif _FX_OS_ == _FX_WIN32_MOBILE_
@@ -346,7 +346,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead,
   if (!pSR->LoadBufferRead(pBufferRead, iFileSize, dwAccess,
                            bReleaseBufferRead)) {
     pSR->Release();
-    return NULL;
+    return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ -358,7 +358,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileRead* pFileRead,
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFileRead(pFileRead, dwAccess)) {
     pSR->Release();
-    return NULL;
+    return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ -370,7 +370,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite* pFileWrite,
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFileWrite(pFileWrite, dwAccess)) {
     pSR->Release();
-    return NULL;
+    return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ -382,7 +382,7 @@ IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName,
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFile(pszFileName, dwAccess)) {
     pSR->Release();
-    return NULL;
+    return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ -395,7 +395,7 @@ IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData,
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadBuffer(pData, length, dwAccess)) {
     pSR->Release();
-    return NULL;
+    return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ -414,8 +414,8 @@ CFX_FileStreamImp::~CFX_FileStreamImp() {
 
 FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName,
                                     uint32_t dwAccess) {
-  ASSERT(m_hFile == NULL);
-  ASSERT(pszSrcFileName != NULL && FXSYS_wcslen(pszSrcFileName) > 0);
+  ASSERT(!m_hFile);
+  ASSERT(pszSrcFileName && FXSYS_wcslen(pszSrcFileName) > 0);
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
   const FX_WCHAR* wsMode;
@@ -462,14 +462,14 @@ FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName,
   }
   CFX_ByteString szFileName = CFX_ByteString::FromUnicode(pszSrcFileName);
   m_hFile = FXSYS_fopen(szFileName.c_str(), wsMode);
-  if (m_hFile == NULL) {
+  if (!m_hFile) {
     if (dwAccess & FX_STREAMACCESS_Write) {
       if (dwAccess & FX_STREAMACCESS_Create) {
         m_hFile = FXSYS_fopen(szFileName.c_str(), "w+b");
       }
-      if (m_hFile == NULL) {
+      if (!m_hFile) {
         m_hFile = FXSYS_fopen(szFileName.c_str(), "r+b");
-        if (m_hFile == NULL) {
+        if (!m_hFile) {
           return FALSE;
         }
         if (dwAccess & FX_STREAMACCESS_Truncate) {
@@ -491,32 +491,32 @@ FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName,
   return TRUE;
 }
 int32_t CFX_FileStreamImp::GetLength() const {
-  ASSERT(m_hFile != NULL);
+  ASSERT(m_hFile);
   return m_iLength;
 }
 int32_t CFX_FileStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
-  ASSERT(m_hFile != NULL);
+  ASSERT(m_hFile);
   FXSYS_fseek(m_hFile, iOffset, eSeek);
   return FXSYS_ftell(m_hFile);
 }
 int32_t CFX_FileStreamImp::GetPosition() {
-  ASSERT(m_hFile != NULL);
+  ASSERT(m_hFile);
   return FXSYS_ftell(m_hFile);
 }
 FX_BOOL CFX_FileStreamImp::IsEOF() const {
-  ASSERT(m_hFile != NULL);
+  ASSERT(m_hFile);
   return FXSYS_ftell(m_hFile) >= m_iLength;
 }
 int32_t CFX_FileStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
-  ASSERT(m_hFile != NULL);
-  ASSERT(pBuffer != NULL && iBufferSize > 0);
+  ASSERT(m_hFile);
+  ASSERT(pBuffer && iBufferSize > 0);
   return FXSYS_fread(pBuffer, 1, iBufferSize, m_hFile);
 }
 int32_t CFX_FileStreamImp::ReadString(FX_WCHAR* pStr,
                                       int32_t iMaxLength,
                                       FX_BOOL& bEOS) {
-  ASSERT(m_hFile != NULL);
-  ASSERT(pStr != NULL && iMaxLength > 0);
+  ASSERT(m_hFile);
+  ASSERT(pStr && iMaxLength > 0);
   if (m_iLength <= 0) {
     return 0;
   }
@@ -573,10 +573,10 @@ FX_BOOL CFX_FileStreamImp::SetLength(int32_t iLength) {
   return bRet;
 }
 CFX_FileReadStreamImp::CFX_FileReadStreamImp()
-    : m_pFileRead(NULL), m_iPosition(0), m_iLength(0) {}
+    : m_pFileRead(nullptr), m_iPosition(0), m_iLength(0) {}
 FX_BOOL CFX_FileReadStreamImp::LoadFileRead(IFX_FileRead* pFileRead,
                                             uint32_t dwAccess) {
-  ASSERT(m_pFileRead == NULL && pFileRead != NULL);
+  ASSERT(!m_pFileRead && pFileRead);
   if (dwAccess & FX_STREAMACCESS_Write) {
     return FALSE;
   }
@@ -610,8 +610,8 @@ FX_BOOL CFX_FileReadStreamImp::IsEOF() const {
   return m_iPosition >= m_iLength;
 }
 int32_t CFX_FileReadStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
-  ASSERT(m_pFileRead != NULL);
-  ASSERT(pBuffer != NULL && iBufferSize > 0);
+  ASSERT(m_pFileRead);
+  ASSERT(pBuffer && iBufferSize > 0);
   if (iBufferSize > m_iLength - m_iPosition) {
     iBufferSize = m_iLength - m_iPosition;
   }
@@ -624,8 +624,8 @@ int32_t CFX_FileReadStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
 int32_t CFX_FileReadStreamImp::ReadString(FX_WCHAR* pStr,
                                           int32_t iMaxLength,
                                           FX_BOOL& bEOS) {
-  ASSERT(m_pFileRead != NULL);
-  ASSERT(pStr != NULL && iMaxLength > 0);
+  ASSERT(m_pFileRead);
+  ASSERT(pStr && iMaxLength > 0);
   iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2;
   if (iMaxLength <= 0) {
     return 0;
@@ -638,12 +638,12 @@ int32_t CFX_FileReadStreamImp::ReadString(FX_WCHAR* pStr,
   return i;
 }
 CFX_BufferReadStreamImp::CFX_BufferReadStreamImp()
-    : m_pBufferRead(NULL),
+    : m_pBufferRead(nullptr),
       m_bReleaseBufferRead(FALSE),
       m_iPosition(0),
       m_iBufferSize(0) {}
 CFX_BufferReadStreamImp::~CFX_BufferReadStreamImp() {
-  if (m_bReleaseBufferRead && m_pBufferRead != NULL) {
+  if (m_bReleaseBufferRead && m_pBufferRead) {
     m_pBufferRead->Release();
   }
 }
@@ -651,7 +651,7 @@ FX_BOOL CFX_BufferReadStreamImp::LoadBufferRead(IFX_BufferRead* pBufferRead,
                                                 int32_t iFileSize,
                                                 uint32_t dwAccess,
                                                 FX_BOOL bReleaseBufferRead) {
-  ASSERT(m_pBufferRead == NULL && pBufferRead != NULL);
+  ASSERT(!m_pBufferRead && pBufferRead);
   if (dwAccess & FX_STREAMACCESS_Write) {
     return FALSE;
   }
@@ -699,8 +699,8 @@ FX_BOOL CFX_BufferReadStreamImp::IsEOF() const {
 }
 int32_t CFX_BufferReadStreamImp::ReadData(uint8_t* pBuffer,
                                           int32_t iBufferSize) {
-  ASSERT(m_pBufferRead != NULL);
-  ASSERT(pBuffer != NULL && iBufferSize > 0);
+  ASSERT(m_pBufferRead);
+  ASSERT(pBuffer && iBufferSize > 0);
   int32_t iLength = GetLength();
   if (m_iPosition >= iLength) {
     return 0;
@@ -754,8 +754,8 @@ int32_t CFX_BufferReadStreamImp::ReadData(uint8_t* pBuffer,
 int32_t CFX_BufferReadStreamImp::ReadString(FX_WCHAR* pStr,
                                             int32_t iMaxLength,
                                             FX_BOOL& bEOS) {
-  ASSERT(m_pBufferRead != NULL);
-  ASSERT(pStr != NULL && iMaxLength > 0);
+  ASSERT(m_pBufferRead);
+  ASSERT(pStr && iMaxLength > 0);
   iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2;
   if (iMaxLength <= 0) {
     return 0;
@@ -768,10 +768,10 @@ int32_t CFX_BufferReadStreamImp::ReadString(FX_WCHAR* pStr,
   return i;
 }
 CFX_FileWriteStreamImp::CFX_FileWriteStreamImp()
-    : m_pFileWrite(NULL), m_iPosition(0) {}
+    : m_pFileWrite(nullptr), m_iPosition(0) {}
 FX_BOOL CFX_FileWriteStreamImp::LoadFileWrite(IFX_FileWrite* pFileWrite,
                                               uint32_t dwAccess) {
-  ASSERT(m_pFileWrite == NULL && pFileWrite != NULL);
+  ASSERT(!m_pFileWrite && pFileWrite);
   if (dwAccess & FX_STREAMACCESS_Read) {
     return FALSE;
   }
@@ -844,11 +844,11 @@ FX_BOOL CFX_BufferStreamImp::LoadBuffer(uint8_t* pData,
   return TRUE;
 }
 int32_t CFX_BufferStreamImp::GetLength() const {
-  ASSERT(m_pData != NULL);
+  ASSERT(m_pData);
   return m_iLength;
 }
 int32_t CFX_BufferStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
-  ASSERT(m_pData != NULL);
+  ASSERT(m_pData);
   if (eSeek == FX_STREAMSEEK_Begin) {
     m_iPosition = iOffset;
   } else if (eSeek == FX_STREAMSEEK_Current) {
@@ -865,16 +865,16 @@ int32_t CFX_BufferStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   return m_iPosition;
 }
 int32_t CFX_BufferStreamImp::GetPosition() {
-  ASSERT(m_pData != NULL);
+  ASSERT(m_pData);
   return m_iPosition;
 }
 FX_BOOL CFX_BufferStreamImp::IsEOF() const {
-  ASSERT(m_pData != NULL);
+  ASSERT(m_pData);
   return m_iPosition >= m_iLength;
 }
 int32_t CFX_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
-  ASSERT(m_pData != NULL);
-  ASSERT(pBuffer != NULL && iBufferSize > 0);
+  ASSERT(m_pData);
+  ASSERT(pBuffer && iBufferSize > 0);
   int32_t iLen = std::min(m_iLength - m_iPosition, iBufferSize);
   if (iLen <= 0) {
     return 0;
@@ -886,8 +886,8 @@ int32_t CFX_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
 int32_t CFX_BufferStreamImp::ReadString(FX_WCHAR* pStr,
                                         int32_t iMaxLength,
                                         FX_BOOL& bEOS) {
-  ASSERT(m_pData != NULL);
-  ASSERT(pStr != NULL && iMaxLength > 0);
+  ASSERT(m_pData);
+  ASSERT(pStr && iMaxLength > 0);
   int32_t iLen = std::min((m_iLength - m_iPosition) / 2, iMaxLength);
   if (iLen <= 0) {
     return 0;
@@ -934,19 +934,19 @@ int32_t CFX_BufferStreamImp::WriteString(const FX_WCHAR* pStr,
 }
 IFX_Stream* IFX_Stream::CreateTextStream(IFX_Stream* pBaseStream,
                                          FX_BOOL bDeleteOnRelease) {
-  ASSERT(pBaseStream != NULL);
+  ASSERT(pBaseStream);
   return new CFX_TextStream(pBaseStream, bDeleteOnRelease);
 }
 CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, FX_BOOL bDelStream)
     : m_wCodePage(FX_CODEPAGE_DefANSI),
       m_wBOMLength(0),
       m_dwBOM(0),
-      m_pBuf(NULL),
+      m_pBuf(nullptr),
       m_iBufSize(0),
       m_bDelStream(bDelStream),
       m_pStreamImp(pStream),
       m_iRefCount(1) {
-  ASSERT(m_pStreamImp != NULL);
+  ASSERT(m_pStreamImp);
   m_pStreamImp->Retain();
   InitStream();
 }
@@ -955,7 +955,7 @@ CFX_TextStream::~CFX_TextStream() {
   if (m_bDelStream) {
     m_pStreamImp->Release();
   }
-  if (m_pBuf != NULL) {
+  if (m_pBuf) {
     FX_Free(m_pBuf);
   }
 }
@@ -1048,8 +1048,8 @@ IFX_Stream* CFX_TextStream::CreateSharedStream(uint32_t dwAccess,
                                                int32_t iLength) {
   IFX_Stream* pSR =
       m_pStreamImp->CreateSharedStream(dwAccess, iOffset, iLength);
-  if (pSR == NULL) {
-    return NULL;
+  if (!pSR) {
+    return nullptr;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
@@ -1075,14 +1075,14 @@ int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
                                    int32_t iMaxLength,
                                    FX_BOOL& bEOS,
                                    int32_t const* pByteSize) {
-  ASSERT(pStr != NULL && iMaxLength > 0);
-  if (m_pStreamImp == NULL) {
+  ASSERT(pStr && iMaxLength > 0);
+  if (!m_pStreamImp) {
     return -1;
   }
   int32_t iLen;
   if (m_wCodePage == FX_CODEPAGE_UTF16LE ||
       m_wCodePage == FX_CODEPAGE_UTF16BE) {
-    int32_t iBytes = pByteSize == NULL ? iMaxLength * 2 : *pByteSize;
+    int32_t iBytes = pByteSize ? *pByteSize : iMaxLength * 2;
     iLen = m_pStreamImp->ReadData((uint8_t*)pStr, iBytes);
     iMaxLength = iLen / 2;
     if (sizeof(FX_WCHAR) > 2) {
@@ -1099,10 +1099,10 @@ int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
 #endif
   } else {
     int32_t pos = m_pStreamImp->GetPosition();
-    int32_t iBytes = pByteSize == NULL ? iMaxLength : *pByteSize;
+    int32_t iBytes = pByteSize ? *pByteSize : iMaxLength;
     iBytes = std::min(iBytes, m_pStreamImp->GetLength() - pos);
     if (iBytes > 0) {
-      if (m_pBuf == NULL) {
+      if (!m_pBuf) {
         m_pBuf = FX_Alloc(uint8_t, iBytes);
         m_iBufSize = iBytes;
       } else if (iBytes > m_iBufSize) {
@@ -1125,7 +1125,7 @@ int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
   return iMaxLength;
 }
 int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
-  ASSERT(pStr != NULL && iLength > 0);
+  ASSERT(pStr && iLength > 0);
   if ((m_pStreamImp->GetAccessModes() & FX_STREAMACCESS_Write) == 0) {
     return -1;
   }
@@ -1143,7 +1143,7 @@ int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
 }
 CFX_Stream::CFX_Stream()
     : m_eStreamType(FX_SREAMTYPE_Unknown),
-      m_pStreamImp(NULL),
+      m_pStreamImp(nullptr),
       m_dwAccess(0),
       m_iTotalSize(0),
       m_iPosition(0),
@@ -1269,7 +1269,7 @@ uint32_t CFX_Stream::GetAccessModes() const {
 }
 
 int32_t CFX_Stream::GetLength() const {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
@@ -1279,7 +1279,7 @@ int32_t CFX_Stream::GetLength() const {
   return m_iLength;
 }
 int32_t CFX_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
@@ -1304,7 +1304,7 @@ int32_t CFX_Stream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   return m_iPosition - m_iStart;
 }
 int32_t CFX_Stream::GetPosition() {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return -1;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
@@ -1314,7 +1314,7 @@ int32_t CFX_Stream::GetPosition() {
   return m_iPosition - m_iStart;
 }
 FX_BOOL CFX_Stream::IsEOF() const {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return TRUE;
   }
   if (m_eStreamType == FX_STREAMTYPE_File ||
@@ -1324,8 +1324,8 @@ FX_BOOL CFX_Stream::IsEOF() const {
   return m_iPosition >= m_iStart + m_iLength;
 }
 int32_t CFX_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
-  ASSERT(pBuffer != NULL && iBufferSize > 0);
-  if (m_pStreamImp == NULL) {
+  ASSERT(pBuffer && iBufferSize > 0);
+  if (!m_pStreamImp) {
     return -1;
   }
   int32_t iLen = std::min(m_iStart + m_iLength - m_iPosition, iBufferSize);
@@ -1343,13 +1343,13 @@ int32_t CFX_Stream::ReadString(FX_WCHAR* pStr,
                                int32_t iMaxLength,
                                FX_BOOL& bEOS,
                                int32_t const* pByteSize) {
-  ASSERT(pStr != NULL && iMaxLength > 0);
-  if (m_pStreamImp == NULL) {
+  ASSERT(pStr && iMaxLength > 0);
+  if (!m_pStreamImp) {
     return -1;
   }
   int32_t iEnd = m_iStart + m_iLength;
   int32_t iLen = iEnd - m_iPosition;
-  if (pByteSize != NULL) {
+  if (pByteSize) {
     iLen = std::min(iLen, *pByteSize);
   }
   iLen = std::min(iEnd / 2, iMaxLength);
@@ -1368,8 +1368,8 @@ int32_t CFX_Stream::ReadString(FX_WCHAR* pStr,
 }
 
 int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
-  ASSERT(pBuffer != NULL && iBufferSize > 0);
-  if (m_pStreamImp == NULL) {
+  ASSERT(pBuffer && iBufferSize > 0);
+  if (!m_pStreamImp) {
     return -1;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
@@ -1394,8 +1394,8 @@ int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
   return iLen;
 }
 int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
-  ASSERT(pStr != NULL && iLength > 0);
-  if (m_pStreamImp == NULL) {
+  ASSERT(pStr && iLength > 0);
+  if (!m_pStreamImp) {
     return -1;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
@@ -1420,7 +1420,7 @@ int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
   return iLen;
 }
 void CFX_Stream::Flush() {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
@@ -1429,7 +1429,7 @@ void CFX_Stream::Flush() {
   m_pStreamImp->Flush();
 }
 FX_BOOL CFX_Stream::SetLength(int32_t iLength) {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return FALSE;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0) {
@@ -1438,7 +1438,7 @@ FX_BOOL CFX_Stream::SetLength(int32_t iLength) {
   return m_pStreamImp->SetLength(iLength);
 }
 int32_t CFX_Stream::GetBOM(uint8_t bom[4]) const {
-  if (m_pStreamImp == NULL) {
+  if (!m_pStreamImp) {
     return -1;
   }
   return 0;
@@ -1461,25 +1461,25 @@ IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
                                            int32_t iOffset,
                                            int32_t iLength) {
   ASSERT(iLength > 0);
-  if (m_pStreamImp == NULL) {
-    return NULL;
+  if (!m_pStreamImp) {
+    return nullptr;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Text) != 0 &&
       (dwAccess & FX_STREAMACCESS_Text) == 0) {
-    return NULL;
+    return nullptr;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Write) == 0 &&
       (dwAccess & FX_STREAMACCESS_Write) != 0) {
-    return NULL;
+    return nullptr;
   }
   int32_t iStart = m_iStart + iOffset;
   int32_t iTotal = m_iStart + m_iLength;
   if (iStart < m_iStart || iStart >= iTotal) {
-    return NULL;
+    return nullptr;
   }
   int32_t iEnd = iStart + iLength;
   if (iEnd < iStart || iEnd > iTotal) {
-    return NULL;
+    return nullptr;
   }
   CFX_Stream* pShared = new CFX_Stream;
   pShared->m_eStreamType = FX_STREAMTYPE_Stream;
@@ -1496,12 +1496,12 @@ IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
 }
 IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream,
                                 FX_BOOL bReleaseStream) {
-  ASSERT(pBaseStream != NULL);
+  ASSERT(pBaseStream);
   return new CFGAS_FileRead(pBaseStream, bReleaseStream);
 }
 CFGAS_FileRead::CFGAS_FileRead(IFX_Stream* pStream, FX_BOOL bReleaseStream)
     : m_bReleaseStream(bReleaseStream), m_pStream(pStream) {
-  ASSERT(m_pStream != NULL);
+  ASSERT(m_pStream);
 }
 CFGAS_FileRead::~CFGAS_FileRead() {
   if (m_bReleaseStream) {
diff --git a/xfa/fgas/crt/fgas_stream.h b/xfa/fgas/crt/fgas_stream.h
index 2da06fc7ed..5cd2a3daa7 100644
--- a/xfa/fgas/crt/fgas_stream.h
+++ b/xfa/fgas/crt/fgas_stream.h
@@ -58,7 +58,7 @@ class IFX_Stream {
   virtual int32_t ReadString(FX_WCHAR* pStr,
                              int32_t iMaxLength,
                              FX_BOOL& bEOS,
-                             int32_t const* pByteSize = NULL) = 0;
+                             int32_t const* pByteSize = nullptr) = 0;
   virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) = 0;
   virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) = 0;
   virtual void Flush() = 0;
diff --git a/xfa/fgas/crt/fgas_system.cpp b/xfa/fgas/crt/fgas_system.cpp
index 43d55b108a..b5cabedec5 100644
--- a/xfa/fgas/crt/fgas_system.cpp
+++ b/xfa/fgas/crt/fgas_system.cpp
@@ -23,7 +23,7 @@ inline int32_t FX_tolower(int32_t ch) {
 }  // namespace
 
 int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count) {
-  ASSERT(s1 != NULL && s2 != NULL && count > 0);
+  ASSERT(s1 && s2 && count > 0);
   FX_WCHAR wch1 = 0;
   FX_WCHAR wch2 = 0;
   while (count-- > 0) {
@@ -37,7 +37,7 @@ int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count) {
 }
 
 FX_FLOAT FX_wcstof(const FX_WCHAR* pwsStr, int32_t iLength, int32_t* pUsedLen) {
-  ASSERT(pwsStr != NULL);
+  ASSERT(pwsStr);
   if (iLength < 0) {
     iLength = FXSYS_wcslen(pwsStr);
   }
diff --git a/xfa/fgas/crt/fgas_system.h b/xfa/fgas/crt/fgas_system.h
index a3215ffa37..83c67735dc 100644
--- a/xfa/fgas/crt/fgas_system.h
+++ b/xfa/fgas/crt/fgas_system.h
@@ -11,7 +11,7 @@
 
 FX_FLOAT FX_wcstof(const FX_WCHAR* pwsStr,
                    int32_t iLength = -1,
-                   int32_t* pUsedLen = NULL);
+                   int32_t* pUsedLen = nullptr);
 int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count);
 
 #endif  // XFA_FGAS_CRT_FGAS_SYSTEM_H_
diff --git a/xfa/fgas/crt/fgas_utils.cpp b/xfa/fgas/crt/fgas_utils.cpp
index 6db7aa35ab..7207f055e5 100644
--- a/xfa/fgas/crt/fgas_utils.cpp
+++ b/xfa/fgas/crt/fgas_utils.cpp
@@ -133,9 +133,9 @@ int32_t CFX_BaseArray::RemoveLast(int32_t iCount) {
 void CFX_BaseArray::RemoveAll(FX_BOOL bLeaveMemory) {
   if (!bLeaveMemory) {
     uint8_t*& pBuffer = m_pData->pBuffer;
-    if (pBuffer != NULL) {
+    if (pBuffer) {
       FX_Free(pBuffer);
-      pBuffer = NULL;
+      pBuffer = nullptr;
     }
     m_pData->iTotalCount = 0;
   }
@@ -178,14 +178,14 @@ uint8_t* CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) {
       }
     }
   }
-  ASSERT(pChunk != NULL);
+  ASSERT(pChunk);
   m_iBlockCount = index + 1;
   return pChunk + (index % m_iChunkSize) * m_iBlockSize;
 }
 uint8_t* CFX_BaseMassArrayImp::GetAt(int32_t index) const {
   ASSERT(index > -1 && index < m_iBlockCount);
   uint8_t* pChunk = (uint8_t*)m_pData->GetAt(index / m_iChunkSize);
-  ASSERT(pChunk != NULL);
+  ASSERT(pChunk);
   return pChunk + (index % m_iChunkSize) * m_iBlockSize;
 }
 int32_t CFX_BaseMassArrayImp::Append(const CFX_BaseMassArrayImp& src,
@@ -258,7 +258,7 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart,
       std::min(iSrcCount, std::min(iSrcChunkSize, iDstChunkSize));
   int32_t iCopyBytes = iCopySize * m_iBlockSize;
   while (iSrcCount > 0) {
-    ASSERT(pDstChunk != NULL && pSrcChunk != NULL);
+    ASSERT(pDstChunk && pSrcChunk);
     FXSYS_memcpy(pDstChunk, pSrcChunk, iCopyBytes);
     iSrcCount -= iCopySize;
     iSrcChunkSize -= iCopySize;
@@ -294,13 +294,9 @@ void CFX_BaseMassArrayImp::RemoveAll(FX_BOOL bLeaveMemory) {
     m_iBlockCount = 0;
     return;
   }
-  for (int32_t i = 0; i < m_iChunkCount; i++) {
-    void* p = m_pData->GetAt(i);
-    if (p == NULL) {
-      continue;
-    }
-    FX_Free(p);
-  }
+  for (int32_t i = 0; i < m_iChunkCount; i++)
+    FX_Free(m_pData->GetAt(i));
+
   m_pData->RemoveAll();
   m_iChunkCount = 0;
   m_iBlockCount = 0;
@@ -363,7 +359,7 @@ uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) {
   FX_BASEDISCRETEARRAYDATA* pData = (FX_BASEDISCRETEARRAYDATA*)m_pData;
   int32_t& iChunkCount = pData->iChunkCount;
   int32_t iChunkSize = pData->iChunkSize;
-  uint8_t* pChunk = NULL;
+  uint8_t* pChunk = nullptr;
   int32_t iChunk = index / iChunkSize;
   if (iChunk < iChunkCount) {
     pChunk = pData->ChunkBuffer.GetAt(iChunk);
@@ -421,7 +417,7 @@ void CFX_BaseStack::Pop() {
 uint8_t* CFX_BaseStack::GetTopElement() const {
   int32_t iSize = m_pData->m_iBlockCount;
   if (iSize < 1) {
-    return NULL;
+    return nullptr;
   }
   return m_pData->GetAt(iSize - 1);
 }
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h
index f01d115b3e..0cf853fa70 100644
--- a/xfa/fgas/crt/fgas_utils.h
+++ b/xfa/fgas/crt/fgas_utils.h
@@ -378,7 +378,7 @@ class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray {
       : CFX_BaseDiscreteArray(iChunkSize, sizeof(baseType)) {}
   baseType& GetAt(int32_t index, const baseType& defValue) const {
     baseType* p = (baseType*)CFX_BaseDiscreteArray::GetAt(index);
-    return p == NULL ? (baseType&)defValue : *p;
+    return p ? *p : (baseType&)defValue;
   }
   baseType* GetPtrAt(int32_t index) const {
     return (baseType*)CFX_BaseDiscreteArray::GetAt(index);
@@ -447,7 +447,7 @@ class CFX_ObjectStackTemplate : public CFX_BaseStack {
   }
   void Pop() {
     baseType* p = (baseType*)CFX_BaseStack::GetTopElement();
-    if (p != NULL) {
+    if (p) {
       p->~baseType();
     }
     CFX_BaseStack::Pop();