diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-14 15:45:39 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 15:45:39 -0700 |
| commit | cb62e7657b3a9a04142028a4e6614029a08e894b (patch) | |
| tree | e7fa5f4c7d7f12bff9315475a89872fb044c36b1 /core/src/fxcrt/fx_basic_maps.cpp | |
| parent | 0f6b51c0fdd14f5762bf3c7412ac59c825443cc3 (diff) | |
| download | pdfium-cb62e7657b3a9a04142028a4e6614029a08e894b.tar.xz | |
Don't bother checking pointers before delete[] and FX_Free().
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1297713003 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_maps.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_maps.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/core/src/fxcrt/fx_basic_maps.cpp b/core/src/fxcrt/fx_basic_maps.cpp index 14a681b832..1558ae6f75 100644 --- a/core/src/fxcrt/fx_basic_maps.cpp +++ b/core/src/fxcrt/fx_basic_maps.cpp @@ -23,10 +23,8 @@ CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize) ASSERT(m_nBlockSize > 0); } void CFX_MapPtrToPtr::RemoveAll() { - if (m_pHashTable) { - FX_Free(m_pHashTable); - m_pHashTable = NULL; - } + FX_Free(m_pHashTable); + m_pHashTable = NULL; m_nCount = 0; m_pFreeList = NULL; m_pBlocks->FreeDataChain(); @@ -134,10 +132,8 @@ CFX_MapPtrToPtr::CAssoc* CFX_MapPtrToPtr::NewAssoc() { void CFX_MapPtrToPtr::InitHashTable(FX_DWORD nHashSize, FX_BOOL bAllocNow) { ASSERT(m_nCount == 0); ASSERT(nHashSize > 0); - if (m_pHashTable != NULL) { - FX_Free(m_pHashTable); - m_pHashTable = NULL; - } + FX_Free(m_pHashTable); + m_pHashTable = NULL; if (bAllocNow) { m_pHashTable = FX_Alloc(CAssoc*, nHashSize); } @@ -321,10 +317,8 @@ void CFX_MapByteStringToPtr::InitHashTable(FX_DWORD nHashSize, FX_BOOL bAllocNow) { ASSERT(m_nCount == 0); ASSERT(nHashSize > 0); - if (m_pHashTable != NULL) { - FX_Free(m_pHashTable); - m_pHashTable = NULL; - } + FX_Free(m_pHashTable); + m_pHashTable = NULL; if (bAllocNow) { m_pHashTable = FX_Alloc(CAssoc*, nHashSize); } |