diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-19 14:56:52 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-19 14:56:52 -0700 |
| commit | bf4aa2cc93a67826247e887b2ba26a1b965eb616 (patch) | |
| tree | a1d6336676d6d70467a7fb94aa0e625b1dbc8c25 /core/src/fxcrt/fx_basic_buffer.cpp | |
| parent | eb6527763171cdb4b0fbfea5a20d691f4d67b660 (diff) | |
| download | pdfium-bf4aa2cc93a67826247e887b2ba26a1b965eb616.tar.xz | |
Revert "Remove FX_Alloc() null checks now that it can't return NULL."
This reverts commit eb6527763171cdb4b0fbfea5a20d691f4d67b660.
Reason for revert: broke javascript tests.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1145843005
Diffstat (limited to 'core/src/fxcrt/fx_basic_buffer.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_buffer.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/src/fxcrt/fx_basic_buffer.cpp b/core/src/fxcrt/fx_basic_buffer.cpp index 06ba9413a5..7903740e47 100644 --- a/core/src/fxcrt/fx_basic_buffer.cpp +++ b/core/src/fxcrt/fx_basic_buffer.cpp @@ -88,8 +88,10 @@ void CFX_BinaryBuf::ExpandBuf(FX_STRSIZE add_size) } else { pNewBuffer = FX_Alloc(FX_BYTE, new_size); } - m_pBuffer = pNewBuffer; - m_AllocSize = new_size; + if (pNewBuffer) { + m_pBuffer = pNewBuffer; + m_AllocSize = new_size; + } } void CFX_BinaryBuf::CopyData(const void* pStr, FX_STRSIZE size) { @@ -454,6 +456,9 @@ FX_INT32 IFX_BufferArchive::AppendBlock(const void* pBuf, size_t size) } if (!m_pBuffer) { m_pBuffer = FX_Alloc(FX_BYTE, m_BufSize); + if (!m_pBuffer) { + return -1; + } } FX_LPBYTE buffer = (FX_LPBYTE)pBuf; FX_STRSIZE temp_size = (FX_STRSIZE)size; |