generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 02:06:04 +02:00
Code Issues Projects Releases Wiki Activity

#3076: Avoid access to already freed memory in JSON code

Browse Source
This commit is contained in:
Günter Obiltschnig
2021-04-11 16:37:16 +02:00
parent 347dc840b5
commit 7e9d10f488
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JSON/include/Poco/JSON/Object.h
View File

@@ -443,7 +443,6 @@ inline std::size_t Object::size() const
inline void Object::remove(const std::string& key) inline void Object::remove(const std::string& key)
{ {
_values.erase(key);
if (_preserveInsOrder) if (_preserveInsOrder)
{ {
KeyList::iterator it = _keys.begin(); KeyList::iterator it = _keys.begin();
@@ -457,6 +456,7 @@ inline void Object::remove(const std::string& key)
} }
} }
} }
_values.erase(key);
_modified = true; _modified = true;
} }

42
JSON/testsuite/src/JSONTest.cpp
View File

@@ -2162,6 +2162,47 @@ void JSONTest::testMove()
assertTrue (nl[2] == "baz"); assertTrue (nl[2] == "baz");
} }
void JSONTest::testRemove()
{
Object obj1;
obj1.set("foo", 0);
obj1.set("bar", 0);
obj1.set("baz", 0);
Object::NameList nl = obj1.getNames();
assertTrue(nl.size() == 3);
assertTrue(nl[0] == "bar");
assertTrue(nl[1] == "baz");
assertTrue(nl[2] == "foo");
obj1.remove("baz");
nl = obj1.getNames();
assertTrue(nl.size() == 2);
assertTrue(nl[0] == "bar");
assertTrue(nl[1] == "foo");
Object obj2(Poco::JSON_PRESERVE_KEY_ORDER);
obj2.set("foo", 0);
obj2.set("bar", 0);
obj2.set("baz", 0);
nl = obj2.getNames();
assertTrue(nl.size() == 3);
assertTrue(nl[0] == "foo");
assertTrue(nl[1] == "bar");
assertTrue(nl[2] == "baz");
obj2.remove("bar");
nl = obj2.getNames();
assertTrue(nl.size() == 2);
assertTrue(nl[0] == "foo");
assertTrue(nl[1] == "baz");
}
CppUnit::Test* JSONTest::suite() CppUnit::Test* JSONTest::suite()
{ {
@@ -2213,6 +2254,7 @@ CppUnit::Test* JSONTest::suite()
CppUnit_addTest(pSuite, JSONTest, testEscapeUnicode); CppUnit_addTest(pSuite, JSONTest, testEscapeUnicode);
CppUnit_addTest(pSuite, JSONTest, testCopy); CppUnit_addTest(pSuite, JSONTest, testCopy);
CppUnit_addTest(pSuite, JSONTest, testMove); CppUnit_addTest(pSuite, JSONTest, testMove);
CppUnit_addTest(pSuite, JSONTest, testRemove);
return pSuite; return pSuite;
} }

1
JSON/testsuite/src/JSONTest.h
View File

@@ -81,6 +81,7 @@ public:
void testCopy(); void testCopy();
void testMove(); void testMove();
void testRemove();
void setUp(); void setUp();
void tearDown(); void tearDown();