Fixed bug in 0.98.3 with key comparison

danielaparker · Jan 25, 2016 · 6573a2f · 6573a2f
1 parent d0a0b3e
commit 6573a2f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/jsoncons/json_structures.hpp b/src/jsoncons/json_structures.hpp
@@ -186,7 +186,13 @@ class compare_with_string
     bool operator()(const ValueT& a, const CharT* b) const
     {
         size_t len = std::min JSONCONS_NO_MACRO_EXP(a.name().length(),length_);
-        return std::char_traits<CharT>::compare(a.name().c_str(),b,len) < 0;
+        int result = std::char_traits<CharT>::compare(a.name().data(),b,len);
+        if (result < 0 || result > 0)
+        {
+            return result < 0;
+        }
+
+        return a.name().length() < length_;
     }
 };
 

diff --git a/test_suite/src/json_accessor_tests.cpp b/test_suite/src/json_accessor_tests.cpp
@@ -41,6 +41,17 @@ BOOST_AUTO_TEST_CASE(test_object_key_proxy)
     BOOST_CHECK(a.is_null());
 }
 
+BOOST_AUTO_TEST_CASE(test_compare_with_string)
+{
+    json a;
+    a["key"] = "value";
+    a["key1"] = "value1";
+    a["key2"] = "value2";
+    BOOST_CHECK(a["key"] == a["key"]);
+    BOOST_CHECK(!(a["key"] == a["key1"]));
+    BOOST_CHECK(!(a["key"] == a["key2"]));
+}
+
 BOOST_AUTO_TEST_CASE(test_count)
 {
 	json a;