commit 972e59c1156818aced8914761aec64b568e8127d
author Laurence Lundblade <lgl@island-resort.com> Sun Nov 11 15:57:23 2018 +0700
committer Laurence Lundblade <lgl@island-resort.com> Sun Nov 11 15:57:23 2018 +0700
tree cc77078d9bf212b07d174a4b3a664f11c6d6f663
parent 30816f201019dc8ad8c0c21a4b9577769dab6925

Increase allowed nesting level to 15

test/qcbor_decode_tests.c

diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index 86c62bb..12be915 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -611,8 +611,11 @@
    return(nReturn);
 }
 
-
-static uint8_t spTooDeepArrays[] = {0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x80};
+// Big enough to test nesting to the depth of 24
+static uint8_t spTooDeepArrays[] = {0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+                                    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+                                    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+                                    0x80};
 
 int ParseTooDeepArrayTest()
 {
@@ -624,7 +627,7 @@
    
    QCBORDecode_Init(&DCtx, UsefulBuf_FROM_BYTE_ARRAY_LITERAL(spTooDeepArrays), QCBOR_DECODE_MODE_NORMAL);
    
-   for(i = 0; i < 10; i++) {
+   for(i = 0; i < QCBOR_MAX_ARRAY_NESTING1; i++) {
       
       if(QCBORDecode_GetNext(&DCtx, &Item) != 0 ||
          Item.uDataType != QCBOR_TYPE_ARRAY ||

test/qcbor_encode_tests.c

diff --git a/test/qcbor_encode_tests.c b/test/qcbor_encode_tests.c
index b42002e..395e43a 100644
--- a/test/qcbor_encode_tests.c
+++ b/test/qcbor_encode_tests.c
@@ -1637,26 +1637,28 @@
    QCBOREncode_Init(&EC, UsefulBuf_FROM_BYTE_ARRAY(spBigBuf));
    
    // ---- Make a complicated nested CBOR structure ---
-   QCBOREncode_OpenArray(&EC);
+#define BSTR_TEST_DEPTH 10
    
-   for(int i = 0; i < QCBOR_MAX_ARRAY_NESTING-2; i++) {
+   QCBOREncode_OpenArray(&EC);
+
+   for(int i = 0; i < BSTR_TEST_DEPTH-2; i++) {
       QCBOREncode_BstrWrap(&EC);
       QCBOREncode_AddUInt64(&EC, i);
    }
    
-   for(int i = 0; i < QCBOR_MAX_ARRAY_NESTING-2; i++) {
+   for(int i = 0; i < BSTR_TEST_DEPTH-2; i++) {
       QCBOREncode_CloseBstrWrap(&EC, NULL);
       QCBOREncode_AddUInt64(&EC, i);
    }
    
-   for(int i = 0; i < (QCBOR_MAX_ARRAY_NESTING-2)/3; i++) {
+   for(int i = 0; i < (BSTR_TEST_DEPTH-2)/3; i++) {
       QCBOREncode_OpenMap(&EC);
       QCBOREncode_BstrWrapMapN(&EC, i+0x20);
       QCBOREncode_OpenArray(&EC);
       QCBOREncode_AddUInt64(&EC, i+0x10);
    }
    
-   for(int i = 0; i < (QCBOR_MAX_ARRAY_NESTING-2)/3; i++) {
+   for(int i = 0; i < (BSTR_TEST_DEPTH-2)/3; i++) {
       QCBOREncode_CloseArray(&EC);
       QCBOREncode_AddUInt64(&EC, i+0x30);
       QCBOREncode_CloseBstrWrap(&EC, NULL);