commit 3f76f639b413e9156eca380bddce67b0fc8b59d6
author Thiago Macieira <thiago.macieira@intel.com> Tue May 12 10:10:09 2015 +0900
committer Thiago Macieira <thiago.macieira@intel.com> Tue May 12 17:45:37 2015 +0900
tree 4063554cddb5448e36d6244e575376abc232523d
parent afa4ff6274497fe44fe58f694a333a5f8de0ecc1

Autotest: test the error conditions in the parser and the encoder

The encoder only supports two error conditions: out of memory (need more
buffer) and illegal simple types. It's possible for the encoder to
encode an array or map with a size the decoder can't parse (UINT32_MAX),
but that's not an error condition.

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

src/cbor.h

diff --git a/src/cbor.h b/src/cbor.h
index 6db2bac..4d1ae4b 100644
--- a/src/cbor.h
+++ b/src/cbor.h
@@ -102,7 +102,6 @@
     /* parser errors streaming errors */
     CborErrorGarbageAtEnd = 256,
     CborErrorUnexpectedEOF,
-    CborErrorBreakMissingAtEOF,     /* special case of UnexpectedEOF */
     CborErrorUnexpectedBreak,
     CborErrorUnknownType,           /* can only heppen in major type 7 */
     CborErrorIllegalType,           /* type not allowed here */

src/cborerrorstrings.c

diff --git a/src/cborerrorstrings.c b/src/cborerrorstrings.c
index 95ff0aa..25e6a58 100644
--- a/src/cborerrorstrings.c
+++ b/src/cborerrorstrings.c
@@ -52,9 +52,6 @@
     case CborErrorUnexpectedEOF:
         return _("unexpected end of data");
 
-    case CborErrorBreakMissingAtEOF:
-        return _("'break' byte missing before end of document");
-
     case CborErrorUnexpectedBreak:
         return _("unexpected 'break' byte");
 

src/cborparser.c

diff --git a/src/cborparser.c b/src/cborparser.c
index b7df8f1..03bb554 100644
--- a/src/cborparser.c
+++ b/src/cborparser.c
@@ -139,7 +139,7 @@
 
     if (descriptor > Value64Bit) {
         if (unlikely(descriptor != IndefiniteLength))
-            return CborErrorIllegalNumber;
+            return type == CborSimpleType ? CborErrorUnknownType : CborErrorIllegalNumber;
         if (likely(!is_fixed_type(type))) {
             // special case
             it->flags |= CborIteratorFlag_UnknownLength;
@@ -398,12 +398,18 @@
         assert(err == CborNoError);
 
         recursed->remaining = len;
-        if (recursed->remaining != len || len == UINT32_MAX)
+        if (recursed->remaining != len || len == UINT32_MAX) {
+            // back track the pointer to indicate where the error occurred
+            recursed->ptr = it->ptr;
             return CborErrorDataTooLarge;
+        }
         if (recursed->type == CborMapType) {
             // maps have keys and values, so we need to multiply by 2
-            if (recursed->remaining > UINT32_MAX / 2)
+            if (recursed->remaining > UINT32_MAX / 2) {
+                // back track the pointer to indicate where the error occurred
+                recursed->ptr = it->ptr;
                 return CborErrorDataTooLarge;
+            }
             recursed->remaining *= 2;
         }
         if (len != 0)