summaryrefslogtreecommitdiff
path: root/core/src/fxcrt/fx_basic_buffer.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-19 14:48:00 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-19 14:48:00 -0700
commiteb6527763171cdb4b0fbfea5a20d691f4d67b660 (patch)
tree7781d0fb716b95696b9f411037508244f4cfc28a /core/src/fxcrt/fx_basic_buffer.cpp
parent59f4b44d1fbb259967ea518e0bf5fa76b0cc9767 (diff)
downloadpdfium-eb6527763171cdb4b0fbfea5a20d691f4d67b660.tar.xz
Remove FX_Alloc() null checks now that it can't return NULL.
This permits some functions to become void's since they, in turn, can't fail. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1142713005
Diffstat (limited to 'core/src/fxcrt/fx_basic_buffer.cpp')
-rw-r--r--core/src/fxcrt/fx_basic_buffer.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/core/src/fxcrt/fx_basic_buffer.cpp b/core/src/fxcrt/fx_basic_buffer.cpp
index 7903740e47..06ba9413a5 100644
--- a/core/src/fxcrt/fx_basic_buffer.cpp
+++ b/core/src/fxcrt/fx_basic_buffer.cpp
@@ -88,10 +88,8 @@ void CFX_BinaryBuf::ExpandBuf(FX_STRSIZE add_size)
} else {
pNewBuffer = FX_Alloc(FX_BYTE, new_size);
}
- if (pNewBuffer) {
- m_pBuffer = pNewBuffer;
- m_AllocSize = new_size;
- }
+ m_pBuffer = pNewBuffer;
+ m_AllocSize = new_size;
}
void CFX_BinaryBuf::CopyData(const void* pStr, FX_STRSIZE size)
{
@@ -456,9 +454,6 @@ 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;