Merge pull request #67 from arangodb/bug-fix/key-translation-error-es616

could break Slice::translate with negative int / garbled key
arangodb · Jun 8, 2020 · 5043e35 · 5043e35
2 parents d11b92e + bbaea58
commit 5043e35
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Validator.cpp b/src/Validator.cpp
@@ -457,7 +457,7 @@ void Validator::validateCompactObject(uint8_t const* ptr, std::size_t length) {
     validate(p, e - p, true);
     Slice key(p);
     bool isString = key.isString();
-    if (!isString && !key.isInteger()) {
+    if (!isString && !key.isSmallInt() && !key.isUInt()) {
       throw Exception(Exception::ValidatorInvalidLength, "Invalid object key type");
     }
     ValueLength keySize = key.byteSize();
@@ -562,7 +562,7 @@ void Validator::validateIndexedObject(uint8_t const* ptr, std::size_t length) {
 
     Slice key(member);
     bool const isString = key.isString();
-    if (!isString && !key.isInteger()) {
+    if (!isString && !key.isSmallInt() && !key.isUInt()) {
       throw Exception(Exception::ValidatorInvalidLength, "Invalid object key type");
     }