gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize MemoryPoolAllocator::Realloc() also, and improve coverage

Browse Source
This commit is contained in:
miloyip 2015-05-03 21:23:13 +08:00
parent ae61b7973c
commit 1c98609ada
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/rapidjson/allocators.h
View File

@ -189,6 +189,9 @@ public:
if (originalPtr == 0) if (originalPtr == 0)
return Malloc(newSize); return Malloc(newSize);
if (newSize == 0)
return NULL;
// Do not shrink if new size is smaller than original // Do not shrink if new size is smaller than original
if (originalSize >= newSize) if (originalSize >= newSize)
return originalPtr; return originalPtr;

3
test/unittest/allocatorstest.cpp
View File

@ -42,6 +42,9 @@ void TestAllocator(Allocator& a) {
EXPECT_EQ(i, r[i]); EXPECT_EQ(i, r[i]);
Allocator::Free(r); Allocator::Free(r);
// Realloc to zero size
EXPECT_TRUE(a.Realloc(a.Malloc(1), 1, 0) == 0);
} }
TEST(Allocator, CrtAllocator) { TEST(Allocator, CrtAllocator) {