feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Fix undefined in format-test (#1349)

Browse Source 
When `MoveCtor` performs `check_move_buffer`, the buffer allocator becomes null,
but then `MoveCtor` attempts to use it to allocate a dynamic buffer. This
succeeds nevertheless because a typical `std::allocator<char>::allocate` does
not use `this`, so it does not crash when `this` is null.

Fixes #1344
This commit is contained in:
Orivej Desh
2019-10-08 22:42:51 +00:00
committed by Victor Zverovich
parent b66bb6b71f
commit a1079e9fd6
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/format-test.cc
View File

@ -271,7 +271,7 @@ static void check_move_buffer(
EXPECT_EQ(alloc, buffer2.get_allocator().get()); EXPECT_EQ(alloc, buffer2.get_allocator().get());
} }
TEST(MemoryBufferTest, MoveCtor) { TEST(MemoryBufferTest, MoveCtorInlineBuffer) {
std::allocator<char> alloc; std::allocator<char> alloc;
basic_memory_buffer<char, 5, TestAllocator> buffer((TestAllocator(&alloc))); basic_memory_buffer<char, 5, TestAllocator> buffer((TestAllocator(&alloc)));
const char test[] = "test"; const char test[] = "test";
@ -281,15 +281,22 @@ TEST(MemoryBufferTest, MoveCtor) {
// dynamic allocation. // dynamic allocation.
buffer.push_back('a'); buffer.push_back('a');
check_move_buffer("testa", buffer); check_move_buffer("testa", buffer);
}
TEST(MemoryBufferTest, MoveCtorDynamicBuffer) {
std::allocator<char> alloc;
basic_memory_buffer<char, 4, TestAllocator> buffer((TestAllocator(&alloc)));
const char test[] = "test";
buffer.append(test, test + 4);
const char* inline_buffer_ptr = &buffer[0]; const char* inline_buffer_ptr = &buffer[0];
// Adding one more character causes the content to move from the inline to // Adding one more character causes the content to move from the inline to
// a dynamically allocated buffer. // a dynamically allocated buffer.
buffer.push_back('b'); buffer.push_back('a');
basic_memory_buffer<char, 5, TestAllocator> buffer2(std::move(buffer)); basic_memory_buffer<char, 4, TestAllocator> buffer2(std::move(buffer));
// Move should rip the guts of the first buffer. // Move should rip the guts of the first buffer.
EXPECT_EQ(inline_buffer_ptr, &buffer[0]); EXPECT_EQ(inline_buffer_ptr, &buffer[0]);
EXPECT_EQ("testab", std::string(&buffer2[0], buffer2.size())); EXPECT_EQ("testa", std::string(&buffer2[0], buffer2.size()));
EXPECT_GT(buffer2.capacity(), 5u); EXPECT_GT(buffer2.capacity(), 4u);
} }
static void check_move_assign_buffer(const char* str, static void check_move_assign_buffer(const char* str,