Merge to XFA: Remove FX_Alloc() null checks now that it can't return NULL.

core/src/fxge/dib/fx_dib_main.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 "../../../include/fxge/fx_dib.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "dib_int.h"
@@ skipping 67 matching lines @@
         return FALSE;
     }
     if (pBuffer) {
         m_pBuffer = pBuffer;
         m_bExtBuf = TRUE;
     } else {
         int size = pitch * height + 4;
         int oomlimit = _MAX_OOM_LIMIT_;
         if (oomlimit >= 0 && size >= oomlimit) {
             m_pBuffer = FX_TryAlloc(FX_BYTE, size);
+            if (m_pBuffer == NULL) {
+                return FALSE;
+            }
         } else {
             m_pBuffer = FX_Alloc(FX_BYTE, size);
         }
-        if (m_pBuffer == NULL) {
-            return FALSE;
-        }
     }
     m_Width = width;
     m_Height = height;
     m_Pitch = pitch;
     if (HasAlpha() && format != FXDIB_Argb) {
         FX_BOOL ret = TRUE;
         ret = BuildAlphaMask();
         if (!ret) {
             if (!m_bExtBuf && m_pBuffer) {
                 FX_Free(m_pBuffer);
@@ skipping 94 matching lines @@
     }
     return pNewBitmap;
 }
 void CFX_DIBSource::BuildPalette()
 {
     if (m_pPalette) {
         return;
     }
     if (GetBPP() == 1) {
         m_pPalette = FX_Alloc(FX_DWORD, 2);
-        if (!m_pPalette) {
-            return;
-        }
         if(IsCmykImage()) {
             m_pPalette[0] = 0xff;
             m_pPalette[1] = 0;
         } else {
             m_pPalette[0] = 0xff000000;
             m_pPalette[1] = 0xffffffff;
         }
     } else if (GetBPP() == 8) {
         m_pPalette = FX_Alloc(FX_DWORD, 256);
-        if (!m_pPalette) {
-            return;
-        }
         if(IsCmykImage()) {
             for (int i = 0; i < 256; i ++) {
                 m_pPalette[i] = 0xff - i;
             }
         } else {
             for (int i = 0; i < 256; i ++) {
                 m_pPalette[i] = 0xff000000 | (i * 0x10101);
             }
         }
     }
@@ skipping 297 matching lines @@
     if (pSrc == NULL || GetBPP() > 8) {
         if (m_pPalette) {
             FX_Free(m_pPalette);
         }
         m_pPalette = NULL;
     } else {
         FX_DWORD pal_size = 1 << GetBPP();
         if (m_pPalette == NULL) {
             m_pPalette = FX_Alloc(FX_DWORD, pal_size);
         }
-        if (!m_pPalette) {
-            return;
-        }
         if (pal_size > size) {
             pal_size = size;
         }
         FXSYS_memcpy32(m_pPalette, pSrc, pal_size * sizeof(FX_DWORD));
     }
 }
 void CFX_DIBSource::GetPalette(FX_DWORD* pal, int alpha) const
 {
     ASSERT(GetBPP() <= 8 && !IsCmykImage());
     if (GetBPP() == 1) {
@@ skipping 1161 matching lines @@
     if (!m_pBitmap->Create(width, height, src_format)) {
         delete m_pBitmap;
         m_pBitmap = NULL;
         return FALSE;
     }
     if (pSrcPalette) {
         m_pBitmap->CopyPalette(pSrcPalette);
     }
     return TRUE;
 }