commit 8f4908840cdd9cc2fe0442033516a273046598a2
author Hasini Gunasinghe <hasinitg@google.com> Tue Jan 11 02:58:57 2022 +0000
committer Hasini Gunasinghe <hasinitg@google.com> Wed Jan 12 03:14:35 2022 +0000
tree 8001d1f036eb96b6757a6ce86e2018de9d1295ac
parent 7301ee25d29c723b341e05da57522d6727c81154

Add input validation for 'parseRecursively' method.

Bug: 192743373
Test: To be verified with fuzzer test case.
Change-Id: If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017

src/cppbor_parse.cpp

diff --git a/src/cppbor_parse.cpp b/src/cppbor_parse.cpp
index 964a72d..9d388a3 100644
--- a/src/cppbor_parse.cpp
+++ b/src/cppbor_parse.cpp
@@ -195,6 +195,13 @@
 
 std::tuple<const uint8_t*, ParseClient*> parseRecursively(const uint8_t* begin, const uint8_t* end,
                                                           bool emitViews, ParseClient* parseClient) {
+    if (begin == end) {
+        parseClient->error(
+                begin,
+                "Input buffer is empty. Begin and end cannot point to the same location.");
+        return {begin, nullptr};
+    }
+
     const uint8_t* pos = begin;
 
     MajorType type = static_cast<MajorType>(*pos & 0xE0);