From 4fdd805c7dbe22bf48ca803fbc57b80ff2f8abee Mon Sep 17 00:00:00 2001 From: "miloyip@gmail.com" Date: Tue, 6 Mar 2012 05:36:42 +0000 Subject: [PATCH] Fixed issue 18 from 0.1x branch git-svn-id: https://rapidjson.googlecode.com/svn/trunk@64 c5894555-1306-4e8d-425f-1f6f381ee07c --- include/rapidjson/document.h | 4 ++-- test/unittest/valuetest.cpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h index 54f4e28..9782107 100644 --- a/include/rapidjson/document.h +++ b/include/rapidjson/document.h @@ -298,9 +298,9 @@ public: RAPIDJSON_ASSERT(data_.o.size > 0); RAPIDJSON_ASSERT(data_.o.members != 0); - if (data_.o.size > 1) { + Member* last = data_.o.members + (data_.o.size - 1); + if (data_.o.size > 1 && m != last) { // Move the last one to this place - Member* last = data_.o.members + (data_.o.size - 1); m->name = last->name; m->value = last->value; } diff --git a/test/unittest/valuetest.cpp b/test/unittest/valuetest.cpp index 6369969..b0c3c8a 100644 --- a/test/unittest/valuetest.cpp +++ b/test/unittest/valuetest.cpp @@ -576,3 +576,17 @@ TEST(Value, BigNestedObject) { } } } + +// Issue 18: Error removing last element of object +// http://code.google.com/p/rapidjson/issues/detail?id=18 +TEST(Value, RemoveLastElement) { + rapidjson::Document doc; + rapidjson::Document::AllocatorType& allocator = doc.GetAllocator(); + rapidjson::Value objVal(rapidjson::kObjectType); + objVal.AddMember("var1", 123, allocator); + objVal.AddMember("var2", "444", allocator); + objVal.AddMember("var3", 555, allocator); + EXPECT_TRUE(objVal.HasMember("var3")); + objVal.RemoveMember("var3"); // Assertion here in r61 + EXPECT_FALSE(objVal.HasMember("var3")); +} \ No newline at end of file