commit fab1b5287207607811ae40ce7ddd730b9c07257e
author Laurence Lundblade <lgl@island-resort.com> Fri Oct 19 13:40:52 2018 +0530
committer Laurence Lundblade <lgl@island-resort.com> Fri Oct 19 13:40:52 2018 +0530
tree 2eaa9f2713b841bfc720888fdd6d2cf943ea347a
parent 471a3fda4bddb20b40b7d2843dd7d0f429bc8b90

fix bugs indicating whether label/data was allocated; improve some decoding tests

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index 9a789d7..831843c 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -441,7 +441,7 @@
 /*
  Decode text and byte strings. Call the string allocator if asked to.
  */
-inline static int DecodeBytes(QCBORStringAllocator *pAlloc, int nMajorType, uint64_t uStrLen, UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem)
+inline static int DecodeBytes(const QCBORStringAllocator *pAlloc, int nMajorType, uint64_t uStrLen, UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem)
 {
    int nReturn = QCBOR_SUCCESS;
    
@@ -575,7 +575,7 @@
  Errors detected here include: an array that is too long to decode, hit end of buffer unexpectedly,
     a few forms of invalid encoded CBOR
  */
-static int GetNext_Item(UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem, QCBORStringAllocator *pAlloc)
+static int GetNext_Item(UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem, const QCBORStringAllocator *pAlloc)
 {
    int nReturn;
    
@@ -592,9 +592,7 @@
    if(nReturn)
       goto Done;
    
-   pDecodedItem->uTagBits   = 0;
-   pDecodedItem->uTag       = 0;
-   pDecodedItem->uDataAlloc = 0;
+   memset(pDecodedItem, 0, sizeof(QCBORItem));
    
    // At this point the major type and the value are valid. We've got the type and the number that
    // starts every CBOR data item.
@@ -860,6 +858,8 @@
       if(nReturn)
          goto Done;
       
+      pDecodedItem->uLabelAlloc = LabelItem.uDataAlloc;
+
       if(LabelItem.uDataType == QCBOR_TYPE_TEXT_STRING) {
          // strings are always good labels
          pDecodedItem->label.string = LabelItem.val.string;