From 3eeb69777a1c50b3e924521b7af6aa1904ecb16e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 Jun 2015 14:38:31 -0700 Subject: Merge to M44: Fix potentially massive memory leak in CPDF_DIBSource::LoadJpxBitmap(). Leaks can happen in several places. For this particular bug, it happens when there is a colorspace component count mismatch. BUG=497191 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1153633009 (cherry picked from commit 2a824f1c0ed786aed0dd15a0ea60dc90999e2b2c) Review URL: https://codereview.chromium.org/1178643002. --- .../fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 139 ++++++++++++++------- core/src/fpdfapi/fpdf_render/render_int.h | 37 +++--- 2 files changed, 113 insertions(+), 63 deletions(-) diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 7093edae47..61a4d9adcf 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxge/fx_ge.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fpdfapi/fpdf_module.h" @@ -55,6 +56,49 @@ FX_SAFE_DWORD CalculatePitch32(int bpp, int width) return pitch; } +// Wrapper class to hold objects allocated in CPDF_DIBSource::LoadJpxBitmap(), +// because nonstd::unique_ptr does not support custom deleters yet. +class JpxBitMapContext +{ + public: + explicit JpxBitMapContext(ICodec_JpxModule* jpx_module) + : jpx_module_(jpx_module), + ctx_(nullptr), + output_offsets_(nullptr) {} + + ~JpxBitMapContext() { + FX_Free(output_offsets_); + jpx_module_->DestroyDecoder(ctx_); + } + + // Takes ownership of |ctx|. + void set_context(void* ctx) { + ctx_ = ctx; + } + + void* context() { + return ctx_; + } + + // Takes ownership of |output_offsets|. + void set_output_offsets(unsigned char* output_offsets) { + output_offsets_ = output_offsets; + } + + unsigned char* output_offsets() { + return output_offsets_; + } + + private: + ICodec_JpxModule* jpx_module_; // Weak pointer. + void* ctx_; // Decoder context, owned. + unsigned char* output_offsets_; // Output offsets for decoding, owned. + + // Disallow evil constructors + JpxBitMapContext(const JpxBitMapContext&); + void operator=(const JpxBitMapContext&); +}; + } // namespace CFX_DIBSource* CPDF_Image::LoadDIBSource(CFX_DIBSource** ppMask, FX_DWORD* pMatteColor, FX_BOOL bStdCS, FX_DWORD GroupFamily, FX_BOOL bLoadMask) const @@ -124,7 +168,6 @@ CPDF_DIBSource::CPDF_DIBSource() m_pCompData = NULL; m_bColorKey = FALSE; m_pMaskedLine = m_pLineBuf = NULL; - m_pCachedBitmap = NULL; m_pDecoder = NULL; m_nComponents = 0; m_bpc = 0; @@ -148,7 +191,7 @@ CPDF_DIBSource::~CPDF_DIBSource() if (m_pLineBuf) { FX_Free(m_pLineBuf); } - delete m_pCachedBitmap; + m_pCachedBitmap.reset(); delete m_pDecoder; if (m_pCompData) { FX_Free(m_pCompData); @@ -165,10 +208,7 @@ CPDF_DIBSource::~CPDF_DIBSource() } CFX_DIBitmap* CPDF_DIBSource::GetBitmap() const { - if (m_pCachedBitmap) { - return m_pCachedBitmap; - } - return Clone(); + return m_pCachedBitmap ? m_pCachedBitmap.get() : Clone(); } void CPDF_DIBSource::ReleaseBitmap(CFX_DIBitmap* pBitmap) const { @@ -375,8 +415,7 @@ int CPDF_DIBSource::ContinueLoadDIBSource(IFX_Pause* pPause) m_pGlobalStream ? m_pGlobalStream->GetData() : NULL, m_pGlobalStream ? m_pGlobalStream->GetSize() : 0, m_pCachedBitmap->GetBuffer(), m_pCachedBitmap->GetPitch(), pPause); if (ret < 0) { - delete m_pCachedBitmap; - m_pCachedBitmap = NULL; + m_pCachedBitmap.reset(); delete m_pGlobalStream; m_pGlobalStream = NULL; pJbig2Module->DestroyJbig2Context(m_pJbig2Context); @@ -401,8 +440,7 @@ int CPDF_DIBSource::ContinueLoadDIBSource(IFX_Pause* pPause) } FXCODEC_STATUS ret = pJbig2Module->ContinueDecode(m_pJbig2Context, pPause); if (ret < 0) { - delete m_pCachedBitmap; - m_pCachedBitmap = NULL; + m_pCachedBitmap.reset(); delete m_pGlobalStream; m_pGlobalStream = NULL; pJbig2Module->DestroyJbig2Context(m_pJbig2Context); @@ -596,12 +634,11 @@ int CPDF_DIBSource::CreateDecoder() m_pDecoder = FPDFAPI_CreateFlateDecoder(src_data, src_size, m_Width, m_Height, m_nComponents, m_bpc, pParams); } else if (decoder == FX_BSTRC("JPXDecode")) { LoadJpxBitmap(); - return m_pCachedBitmap != NULL ? 1 : 0; + return m_pCachedBitmap ? 1 : 0; } else if (decoder == FX_BSTRC("JBIG2Decode")) { - m_pCachedBitmap = new CFX_DIBitmap; + m_pCachedBitmap.reset(new CFX_DIBitmap); if (!m_pCachedBitmap->Create(m_Width, m_Height, m_bImageMask ? FXDIB_1bppMask : FXDIB_1bppRgb)) { - delete m_pCachedBitmap; - m_pCachedBitmap = NULL; + m_pCachedBitmap.reset(); return 0; } m_Status = 1; @@ -632,30 +669,37 @@ int CPDF_DIBSource::CreateDecoder() void CPDF_DIBSource::LoadJpxBitmap() { ICodec_JpxModule* pJpxModule = CPDF_ModuleMgr::Get()->GetJpxModule(); - if (pJpxModule == NULL) { + if (!pJpxModule) return; - } - FX_LPVOID ctx = pJpxModule->CreateDecoder(m_pStreamAcc->GetData(), m_pStreamAcc->GetSize(), m_pColorSpace != NULL); - if (ctx == NULL) { + + nonstd::unique_ptr context( + new JpxBitMapContext(pJpxModule)); + context->set_context(pJpxModule->CreateDecoder(m_pStreamAcc->GetData(), + m_pStreamAcc->GetSize(), + m_pColorSpace != nullptr)); + if (!context->context()) return; - } - FX_DWORD width = 0, height = 0, codestream_nComps = 0, image_nComps = 0; - pJpxModule->GetImageInfo(ctx, width, height, codestream_nComps, image_nComps); - if ((int)width < m_Width || (int)height < m_Height) { - pJpxModule->DestroyDecoder(ctx); + + FX_DWORD width = 0; + FX_DWORD height = 0; + FX_DWORD codestream_nComps = 0; + FX_DWORD image_nComps = 0; + pJpxModule->GetImageInfo(context->context(), width, height, + codestream_nComps, image_nComps); + if ((int)width < m_Width || (int)height < m_Height) return; - } + int output_nComps; - FX_BOOL bTranslateColor, bSwapRGB = FALSE; + FX_BOOL bTranslateColor; + FX_BOOL bSwapRGB = FALSE; if (m_pColorSpace) { - if (codestream_nComps != (FX_DWORD)m_pColorSpace->CountComponents()) { + if (codestream_nComps != (FX_DWORD)m_pColorSpace->CountComponents()) return; - } output_nComps = codestream_nComps; bTranslateColor = FALSE; if (m_pColorSpace == CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB)) { bSwapRGB = TRUE; - m_pColorSpace = NULL; + m_pColorSpace = nullptr; } } else { bTranslateColor = TRUE; @@ -683,35 +727,36 @@ void CPDF_DIBSource::LoadJpxBitmap() width = (width * output_nComps + 2) / 3; format = FXDIB_Rgb; } - m_pCachedBitmap = new CFX_DIBitmap; + m_pCachedBitmap.reset(new CFX_DIBitmap); if (!m_pCachedBitmap->Create(width, height, format)) { - delete m_pCachedBitmap; - m_pCachedBitmap = NULL; + m_pCachedBitmap.reset(); return; } m_pCachedBitmap->Clear(0xFFFFFFFF); - FX_LPBYTE output_offsets = FX_Alloc(FX_BYTE, output_nComps); - for (int i = 0; i < output_nComps; i ++) { - output_offsets[i] = i; - } + context->set_output_offsets(FX_Alloc(unsigned char, output_nComps)); + for (int i = 0; i < output_nComps; ++i) + context->output_offsets()[i] = i; if (bSwapRGB) { - output_offsets[0] = 2; - output_offsets[2] = 0; - } - if (!pJpxModule->Decode(ctx, m_pCachedBitmap->GetBuffer(), m_pCachedBitmap->GetPitch(), bTranslateColor, output_offsets)) { - delete m_pCachedBitmap; - m_pCachedBitmap = NULL; + context->output_offsets()[0] = 2; + context->output_offsets()[2] = 0; + } + if (!pJpxModule->Decode(context->context(), + m_pCachedBitmap->GetBuffer(), + m_pCachedBitmap->GetPitch(), + bTranslateColor, + context->output_offsets())) { + m_pCachedBitmap.reset(); return; } - FX_Free(output_offsets); - pJpxModule->DestroyDecoder(ctx); - if (m_pColorSpace && m_pColorSpace->GetFamily() == PDFCS_INDEXED && m_bpc < 8) { + if (m_pColorSpace && + m_pColorSpace->GetFamily() == PDFCS_INDEXED && + m_bpc < 8) { int scale = 8 - m_bpc; - for (FX_DWORD row = 0; row < height; row ++) { + for (FX_DWORD row = 0; row < height; ++row) { FX_LPBYTE scanline = (FX_LPBYTE)m_pCachedBitmap->GetScanline(row); - for (FX_DWORD col = 0; col < width; col ++) { + for (FX_DWORD col = 0; col < width; ++col) { *scanline = (*scanline) >> scale; - scanline++; + ++scanline; } } } diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index 086a1c24b2..529128e8f9 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -1,15 +1,18 @@ // 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 -#ifndef _FPDF_PAGEOBJ_H_ +#ifndef CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_ +#define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_ + +#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" -#endif + class CPDF_QuickStretcher; #define TYPE3_MAX_BLUES 16 -class CPDF_Type3Glyphs +class CPDF_Type3Glyphs { public: CPDF_Type3Glyphs() @@ -25,7 +28,7 @@ public: int m_TopBlueCount, m_BottomBlueCount; }; class CFX_GlyphBitmap; -class CPDF_Type3Cache +class CPDF_Type3Cache { public: CPDF_Type3Cache(CPDF_Type3Font* pFont) @@ -39,7 +42,7 @@ protected: CPDF_Type3Font* m_pFont; CFX_MapByteStringToPtr m_SizeMap; }; -class CPDF_TransferFunc +class CPDF_TransferFunc { public: CPDF_Document* m_pPDFDoc; @@ -51,7 +54,7 @@ public: }; typedef CFX_MapPtrTemplate*> CPDF_Type3CacheMap; typedef CFX_MapPtrTemplate*> CPDF_TransferFuncMap; -class CPDF_DocRenderData +class CPDF_DocRenderData { public: CPDF_DocRenderData(CPDF_Document* pPDFDoc = NULL); @@ -78,7 +81,7 @@ public: CFX_AffineMatrix m_Matrix; }; typedef CFX_ArrayTemplate<_PDF_RenderItem> CPDF_RenderLayer; -class IPDF_ObjectRenderer +class IPDF_ObjectRenderer { public: static IPDF_ObjectRenderer* Create(int type); @@ -87,7 +90,7 @@ public: virtual FX_BOOL Continue(IFX_Pause* pPause) = 0; FX_BOOL m_Result; }; -class CPDF_RenderStatus +class CPDF_RenderStatus { public: CPDF_RenderStatus(); @@ -179,7 +182,7 @@ protected: FX_ARGB m_T3FillColor; int m_curBlend; }; -class CPDF_ImageLoader +class CPDF_ImageLoader { public: CPDF_ImageLoader() @@ -205,7 +208,7 @@ protected: FX_INT32 m_nDownsampleWidth; FX_INT32 m_nDownsampleHeight; }; -class CPDF_ProgressiveImageLoaderHandle +class CPDF_ProgressiveImageLoaderHandle { public: CPDF_ProgressiveImageLoaderHandle(); @@ -258,7 +261,7 @@ protected: FX_BOOL DrawMaskedImage(); FX_BOOL DrawPatternImage(const CFX_Matrix* pObj2Device); }; -class CPDF_ScaledRenderBuffer +class CPDF_ScaledRenderBuffer { public: CPDF_ScaledRenderBuffer(); @@ -283,7 +286,7 @@ private: CFX_AffineMatrix m_Matrix; }; class ICodec_ScanlineDecoder; -class CPDF_QuickStretcher +class CPDF_QuickStretcher { public: CPDF_QuickStretcher(); @@ -300,7 +303,7 @@ public: CPDF_StreamAcc m_StreamAcc; int m_LineIndex; }; -class CPDF_DeviceBuffer +class CPDF_DeviceBuffer { public: CPDF_DeviceBuffer(); @@ -324,7 +327,7 @@ private: CFX_DIBitmap* m_pBitmap; CFX_AffineMatrix m_Matrix; }; -class CPDF_ImageCache +class CPDF_ImageCache { public: CPDF_ImageCache(CPDF_Document* pDoc, CPDF_Stream* pStream); @@ -441,7 +444,7 @@ protected: DIB_COMP_DATA* m_pCompData; FX_LPBYTE m_pLineBuf; FX_LPBYTE m_pMaskedLine; - CFX_DIBitmap* m_pCachedBitmap; + nonstd::unique_ptr m_pCachedBitmap; ICodec_ScanlineDecoder* m_pDecoder; }; #define FPDF_HUGE_IMAGE_SIZE 60000000 @@ -465,3 +468,5 @@ struct _CPDF_UniqueKeyGen { FX_CHAR m_Key[128]; int m_KeyLen; }; + +#endif // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_ -- cgit v1.2.3