diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-15 15:07:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-15 15:07:20 -0700 |
| commit | 9f6f34892fdfff87c49a9df4c1e34790c0fa1272 (patch) | |
| tree | 94a781a6275bc56ab5909fc5db96b86522be4d40 /core/src/fxcodec | |
| parent | dc0bd92913648910e35328cdaf3e992c91bd0e74 (diff) | |
| download | pdfium-9f6f34892fdfff87c49a9df4c1e34790c0fa1272.tar.xz | |
Abort on OOM by default in FX_Alloc().
Add a FX_TryAlloc() for those few cases where we might need to continue
in face of OOM.
Remove FX_AllocNL() (the context of its use would suggest that NL
means "No Limit"). This is used for some big allocations, so replace
it with TryAlloc(). Large allocations may be worth trying to continue
from, since there are few and they have a large chance of failing.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1128043009
Diffstat (limited to 'core/src/fxcodec')
| -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 d4df1965fb..e8aad711f3 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -119,7 +119,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; } |