commit 7e0d13b4e8b2550c6dcda3cf65c64aadda670093
author Laurence Lundblade <lgl@island-resort.com> Tue Oct 16 19:54:13 2018 +0530
committer Laurence Lundblade <lgl@island-resort.com> Tue Oct 16 19:54:13 2018 +0530
tree 00995f9c7331212fdf9f9a82bef2417e3d82431e
parent 57dd144a3d92190ed51dcffb1a7a108469604240

A few more indefinite length tests; some code tidying up

test/qcbor_decode_tests.c

diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index a534366..10c7bdb 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -1922,17 +1922,19 @@
    return 0;
 }
 
+
 int indefinite_length_decode_string_test()
 {
    QCBORDecodeContext DC;
    QCBORItem Item;
+   // big enough for MakeIndefiniteBigBstr() + MemPool overhead
    UsefulBuf_MakeStackUB(MemPool, 320);
    
    // --- Simple normal indefinite length string ------
    UsefulBufC IndefLen = UsefulBuf_FromByteArrayLiteral(pIndefiniteLenString);
    QCBORDecode_Init(&DC, IndefLen, QCBOR_DECODE_MODE_NORMAL);
     
-   if(QCBORDecode_SetMemPool(&DC,  MemPool, false)) {
+   if(QCBORDecode_SetMemPool(&DC, MemPool, false)) {
       return -1;
    }
     
@@ -2007,7 +2009,6 @@
       return -18;
    }
    
-   
    // ------ Don't set a string allocator and see an error -----
    QCBORDecode_Init(&DC, IndefLen, QCBOR_DECODE_MODE_NORMAL);
    
@@ -2027,14 +2028,12 @@
    if(!QCBORDecode_SetMemPool(&DC,  MemPoolTooSmall, false)) {
       return -21;
    }
-
-
    
    // ----- Mempool is way too small -----
    UsefulBuf_MakeStackUB(BigIndefBStrStorage, 290);
    UsefulBufC BigIndefBStr = MakeIndefiniteBigBstr(BigIndefBStrStorage);
    
-   UsefulBuf_MakeStackUB(MemPoolSmall, 80); // 80 is big enough for the overhead, but not BigIndefBStr
+   UsefulBuf_MakeStackUB(MemPoolSmall, 80); // 80 is big enough for MemPool overhead, but not BigIndefBStr
    
    QCBORDecode_Init(&DC, BigIndefBStr, QCBOR_DECODE_MODE_NORMAL);
    if(QCBORDecode_SetMemPool(&DC,  MemPoolSmall, false)) {
@@ -2056,15 +2055,17 @@
       return -25;
    }
    
-   QCBORDecode_GetNext(&DC, &Item);
-   if(Item.uDataType != QCBOR_TYPE_ARRAY) {
+   if(QCBORDecode_GetNext(&DC, &Item)) {
+      return -26;
+   }
+   if(Item.uDataType != QCBOR_TYPE_ARRAY || Item.uDataAlloc) {
       return -26;
    }
    
    if(QCBORDecode_GetNext(&DC, &Item)) {
       return -27;
    }
-   if(Item.uDataType != QCBOR_TYPE_BYTE_STRING) {
+   if(Item.uDataType != QCBOR_TYPE_BYTE_STRING || !Item.uDataAlloc || Item.uNestingLevel != 1) {
       return -28;
    }
    if(CheckBigString(Item.val.string)) {