j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

#394 fixed memory leak in unit-allocator, found by clang's fsanitize

Browse source
This commit is contained in:
Daniel Cohen 2016-12-25 22:52:37 +02:00
parent 010ea126f3
commit ff3221a375
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/src/unit-allocator.cpp
View file

@ -111,6 +111,16 @@ struct my_allocator : std::allocator<T>
} }
}; };
// allows deletion of raw pointer, usually hold by json_value
template<class T>
void my_allocator_clean_up(T* p)
{
assert(p != nullptr);
my_allocator<T> alloc;
alloc.destroy(p);
alloc.deallocate(p, 1);
}
TEST_CASE("controlled bad_alloc") TEST_CASE("controlled bad_alloc")
{ {
// create JSON type using the throwing allocator // create JSON type using the throwing allocator
@ -131,7 +141,8 @@ TEST_CASE("controlled bad_alloc")
{ {
next_construct_fails = false; next_construct_fails = false;
auto t = my_json::value_t::object; auto t = my_json::value_t::object;
CHECK_NOTHROW(my_json::json_value j(t)); auto clean_up = [](my_json::json_value& j){ my_allocator_clean_up(j.object); };
CHECK_NOTHROW(my_json::json_value j(t); clean_up(j));
next_construct_fails = true; next_construct_fails = true;
CHECK_THROWS_AS(my_json::json_value j(t), std::bad_alloc); CHECK_THROWS_AS(my_json::json_value j(t), std::bad_alloc);
next_construct_fails = false; next_construct_fails = false;
@ -140,7 +151,8 @@ TEST_CASE("controlled bad_alloc")
{ {
next_construct_fails = false; next_construct_fails = false;
auto t = my_json::value_t::array; auto t = my_json::value_t::array;
CHECK_NOTHROW(my_json::json_value j(t)); auto clean_up = [](my_json::json_value& j){ my_allocator_clean_up(j.array); };
CHECK_NOTHROW(my_json::json_value j(t); clean_up(j));
next_construct_fails = true; next_construct_fails = true;
CHECK_THROWS_AS(my_json::json_value j(t), std::bad_alloc); CHECK_THROWS_AS(my_json::json_value j(t), std::bad_alloc);
next_construct_fails = false; next_construct_fails = false;
@ -149,7 +161,8 @@ TEST_CASE("controlled bad_alloc")
{ {
next_construct_fails = false; next_construct_fails = false;
auto t = my_json::value_t::string; auto t = my_json::value_t::string;
CHECK_NOTHROW(my_json::json_value j(t)); auto clean_up = [](my_json::json_value& j){ my_allocator_clean_up(j.string); };
CHECK_NOTHROW(my_json::json_value j(t); clean_up(j));
next_construct_fails = true; next_construct_fails = true;
CHECK_THROWS_AS(my_json::json_value j(t), std::bad_alloc); CHECK_THROWS_AS(my_json::json_value j(t), std::bad_alloc);
next_construct_fails = false; next_construct_fails = false;
@ -160,7 +173,8 @@ TEST_CASE("controlled bad_alloc")
{ {
next_construct_fails = false; next_construct_fails = false;
my_json::string_t v("foo"); my_json::string_t v("foo");
CHECK_NOTHROW(my_json::json_value j(v)); auto clean_up = [](my_json::json_value& j){ my_allocator_clean_up(j.string); };
CHECK_NOTHROW(my_json::json_value j(v); clean_up(j));
next_construct_fails = true; next_construct_fails = true;
CHECK_THROWS_AS(my_json::json_value j(v), std::bad_alloc); CHECK_THROWS_AS(my_json::json_value j(v), std::bad_alloc);
next_construct_fails = false; next_construct_fails = false;