Consider also the key length in the comparison

This make a difference when dictionary keys contain null-bytes.
python-rapidjson · Aug 24, 2017 · 694fbac · 694fbac
1 parent a9959b2
commit 694fbac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/rapidjson.cpp b/rapidjson.cpp
@@ -1487,7 +1487,10 @@ struct DictItem {
         {}
 
     bool operator<(const DictItem& other) const {
-        return strcmp(other.key_str, this->key_str) < 0;
+        Py_ssize_t tks = this->key_size;
+        Py_ssize_t oks = other.key_size;
+        int cmp = strncmp(other.key_str, this->key_str, oks < tks ? oks : tks);
+        return (cmp == 0) ? oks < tks : cmp < 0;
     }
 };
 

diff --git a/tests/test_params.py b/tests/test_params.py
@@ -189,6 +189,10 @@ def test_sort_keys(dumps):
     assert dumps(o, sort_keys=True, indent=4) == expected2
     assert dumps(o, sort_keys=True, indent=0) == expected0
 
+    o = {'a0': 'a0', 'a': 'a', 'a1': 'a1', 'a\x00b': 'a\x00b'}
+    assert sorted(o.keys()) == ['a', 'a\x00b', 'a0', 'a1']
+    assert dumps(o, sort_keys=True) == '{"a":"a","a\\u0000b":"a\\u0000b","a0":"a0","a1":"a1"}'
+
 
 @pytest.mark.unit
 def test_default():