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/fxge/dib/fx_dib_main.cpp | |
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/fxge/dib/fx_dib_main.cpp')
-rw-r--r-- | core/src/fxge/dib/fx_dib_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 2cb41f62b7..d9e401897b 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -84,7 +84,7 @@ FX_BOOL CFX_DIBitmap::Create(int width, int height, FXDIB_Format format, FX_LPBY int size = pitch * height + 4; int oomlimit = _MAX_OOM_LIMIT_; if (oomlimit >= 0 && size >= oomlimit) { - m_pBuffer = FX_AllocNL(FX_BYTE, size); + m_pBuffer = FX_TryAlloc(FX_BYTE, size); } else { m_pBuffer = FX_Alloc(FX_BYTE, size); } |