Skip map 32

bblanchon · bblanchon · commit 09e50f10296d · 2020-10-03T14:41:52.000+02:00
diff --git a/extras/tests/MsgPackDeserializer/filter.cpp b/extras/tests/MsgPackDeserializer/filter.cpp
@@ -311,6 +311,20 @@ TEST_CASE("deserializeMsgPack() filter") {
       CHECK(doc.as<std::string>() == "{\"include\":42}");
       CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
     }
+
+    SECTION("skip map 32") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA6ignore"
+                                 "\xDF\x00\x00\x00\x02"
+                                 "\xA4zero\xCA\x00\x00\x00\x00"
+                                 "\xA2pi\xCA\x40\x48\xF5\xC3"
+                                 "\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+    }
   }
 
   SECTION("filter = true") {
diff --git a/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
@@ -204,6 +204,9 @@ class MsgPackDeserializer {
 
       case 0xde:  // map 16
         return skipObject<uint16_t>(nestingLimit);
+
+      case 0xdf:  // map 32
+        return skipObject<uint32_t>(nestingLimit);
     }
 
     return true;

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,9 @@ class MsgPackDeserializer {`
`204`	`204`
`205`	`205`	`case 0xde: // map 16`
`206`	`206`	`return skipObject<uint16_t>(nestingLimit);`
	`207`	`+`
	`208`	`+ case 0xdf: // map 32`
	`209`	`+ return skipObject<uint32_t>(nestingLimit);`
`207`	`210`	`}`
`208`	`211`
`209`	`212`	`return true;`