diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-15 16:30:52 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-15 16:30:52 -0700 |
| commit | ed099befbb300d6f9c393cb415fdb2a68c2ef471 (patch) | |
| tree | 58516c42af12b16c521b6f1fdee5b8f059a262c0 /core/src/fxcodec/codec | |
| parent | 917c7fa7ccb5b7d5a9d89e717357f0ac6dfb9aa9 (diff) | |
| download | pdfium-ed099befbb300d6f9c393cb415fdb2a68c2ef471.tar.xz | |
Merge to XFA: Abort on OOM by default in FX_Alloc().
Original Review URL: https://codereview.chromium.org/1128043009
Original Review URL: https://codereview.chromium.org/1142463005
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1144683002
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 36dff5e5b2..0c30684e68 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -123,7 +123,7 @@ void CCodec_ScanlineDecoder::DownScale(int dest_width, int dest_height) FX_Free(m_pDataCache); m_pDataCache = NULL; } - m_pDataCache = (CCodec_ImageDataCache*)FX_AllocNL(FX_BYTE, sizeof(CCodec_ImageDataCache) + m_Pitch * m_OutputHeight); + m_pDataCache = (CCodec_ImageDataCache*)FX_TryAlloc(FX_BYTE, sizeof(CCodec_ImageDataCache) + m_Pitch * m_OutputHeight); if (m_pDataCache == NULL) { return; } |