Fix a leak with FPDFPageObj_NewImgeObj().

core/fpdfapi/fpdf_page/cpdf_image.cpp

 // Copyright 2016 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 "core/fpdfapi/fpdf_page/include/cpdf_image.h"
 
+#include <memory>
+
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 #include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
 
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc)
     : m_pDIBSource(nullptr),
       m_pMask(nullptr),
       m_MatteColor(0),
       m_pStream(nullptr),
-      m_bInline(FALSE),
+      m_bInline(false),
       m_pInlineDict(nullptr),
+      m_Height(0),
+      m_Width(0),
+      m_bIsMask(false),
+      m_bInterpolate(false),
       m_pDocument(pDoc),
       m_pOC(nullptr) {}
 
 CPDF_Image::~CPDF_Image() {
   if (m_bInline) {
     if (m_pStream)
       m_pStream->Release();
     if (m_pInlineDict)
       m_pInlineDict->Release();
   }
 }
 
+bool CPDF_Image::CanRelease() const {
+  return m_bInline || (m_pStream && m_pStream->GetObjNum() == 0);
+}
+
 void CPDF_Image::Release() {
-  if (m_bInline || (m_pStream && m_pStream->GetObjNum() == 0))
+  if (CanRelease())
     delete this;
 }
 
 CPDF_Image* CPDF_Image::Clone() {
   if (m_pStream->GetObjNum())
     return m_pDocument->GetPageData()->GetImage(m_pStream);
 
   CPDF_Image* pImage = new CPDF_Image(m_pDocument);
   pImage->LoadImageF(ToStream(m_pStream->Clone()), m_bInline);
   if (m_bInline)
     pImage->SetInlineDict(ToDictionary(m_pInlineDict->Clone(TRUE)));
 
   return pImage;
 }
 
-FX_BOOL CPDF_Image::LoadImageF(CPDF_Stream* pStream, FX_BOOL bInline) {
+void CPDF_Image::LoadImageF(CPDF_Stream* pStream, bool bInline) {
   m_pStream = pStream;
   if (m_bInline && m_pInlineDict) {
     m_pInlineDict->Release();
     m_pInlineDict = nullptr;
   }
   m_bInline = bInline;
   CPDF_Dictionary* pDict = pStream->GetDict();
-  if (m_bInline) {
+  if (m_bInline)
     m_pInlineDict = ToDictionary(pDict->Clone());
-  }
+
   m_pOC = pDict->GetDictBy("OC");
   m_bIsMask =
       !pDict->KeyExist("ColorSpace") || pDict->GetIntegerBy("ImageMask");
   m_bInterpolate = pDict->GetIntegerBy("Interpolate");
   m_Height = pDict->GetIntegerBy("Height");
   m_Width = pDict->GetIntegerBy("Width");
-  return TRUE;
 }
 
 CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, uint32_t size) {
   int32_t width;
   int32_t height;
   int32_t num_comps;
   int32_t bits;
   bool color_trans;
   if (!CPDF_ModuleMgr::Get()->GetJpegModule()->LoadInfo(
           pData, size, &width, &height, &num_comps, &bits, &color_trans)) {
@@ skipping 328 matching lines @@
   }
   if (!ret) {
     delete m_pDIBSource;
     m_pDIBSource = nullptr;
     return FALSE;
   }
   m_pMask = pSource->DetachMask();
   m_MatteColor = pSource->GetMatteColor();
   return FALSE;
 }