commit a44d5064c6233370d7cc6a38c18d8a11c38c3115
author Laurence Lundblade <lgl@island-resort.com> Wed Oct 17 18:45:12 2018 +0530
committer Laurence Lundblade <lgl@island-resort.com> Wed Oct 17 18:45:12 2018 +0530
tree e164d90dd85b50e01ca0bd8d2e1010e645526d23
parent 7e0d13b4e8b2550c6dcda3cf65c64aadda670093

fix bug in using string allocator for all strings; tests for string allocator for all strings; documentation for..

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index f789d0a..ab8ce57 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -171,7 +171,7 @@
       // Nothing to do for empty definite lenth arrays. They are just are
       // effectively the same as an item that is not a map or array
       goto Done;
-      // Empty indefinite length maps and arrays are handled elsewhere; TODO: where?
+      // Empty indefinite length maps and arrays are handled elsewhere
    }
    
    // Error out if arrays is too long to handle
@@ -281,9 +281,6 @@
          nReturn = QCBOR_ERR_UNSUPPORTED;
          goto Done;
 
-      case LEN_IS_INDEFINITE:
-         // Fall through to see what happens: TODO: check this.
-         
       default:
          // This is when the "number" is in the additional info
          uTmpValue = uAdditionalInfo;
@@ -443,19 +440,19 @@
 /*
  Decode text and byte strings
  */
-inline static int DecodeBytes(QCBORStringAllocator *pAlloc, int nMajorType, uint64_t uNumber, UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem)
+inline static int DecodeBytes(QCBORStringAllocator *pAlloc, int nMajorType, uint64_t uStrLen, UsefulInputBuf *pUInBuf, QCBORItem *pDecodedItem)
 {
-    UsefulBufC Bytes = UsefulInputBuf_GetUsefulBuf(pUInBuf, uNumber);
+    UsefulBufC Bytes = UsefulInputBuf_GetUsefulBuf(pUInBuf, uStrLen);
    
    int nReturn = QCBOR_ERR_HIT_END;
    
    if(!UsefulBuf_IsNULLC(Bytes)) {
       if(pAlloc) {
-         UsefulBuf NewMem = pAlloc->fAllocate(pAlloc->pAllocaterContext, NULL, uNumber);
-         if(UsefulBuf_IsNULL(NewMem)) {
+         UsefulBuf NewMem = pAlloc->fAllocate(pAlloc->pAllocaterContext, NULL, uStrLen);
+         if(!UsefulBuf_IsNULL(NewMem)) {
             pDecodedItem->val.string = UsefulBuf_Copy(NewMem, Bytes);
          } else {
-            // TODO: failure
+            return QCBOR_ERR_STRING_ALLOC;
          }
       } else {
          pDecodedItem->val.string = Bytes;
@@ -605,7 +602,7 @@
       case CBOR_MAJOR_TYPE_TEXT_STRING: // Major type 3
          if(uAdditionalInfo == LEN_IS_INDEFINITE) {
             pDecodedItem->uDataType  = (uMajorType == CBOR_MAJOR_TYPE_BYTE_STRING) ? QCBOR_TYPE_BYTE_STRING : QCBOR_TYPE_TEXT_STRING;
-            pDecodedItem->val.string = (UsefulBufC){NULL, SIZE_MAX}; // TODO: SIZE_MAX this is OK, right?
+            pDecodedItem->val.string = (UsefulBufC){NULL, SIZE_MAX};
          } else {
             nReturn = DecodeBytes(pAlloc, uMajorType, uNumber, pUInBuf, pDecodedItem);
          }
@@ -619,7 +616,7 @@
             goto Done;
          }
          if(uAdditionalInfo == LEN_IS_INDEFINITE) {
-            pDecodedItem->val.uCount = UINT16_MAX; // Indicate indefinite length; TODO: a better way?
+            pDecodedItem->val.uCount = UINT16_MAX; // Indicate indefinite length
          } else {
             pDecodedItem->val.uCount = (uint16_t)uNumber; // type conversion OK because of check above
          }
@@ -744,7 +741,7 @@
 {
    int nReturn;
    
-   // TODO: optimize loop below so there is only one call to GetNext_FullItem
+   // TODO: optimize loop below so there is only one call to GetNext_FullItem?
    nReturn = GetNext_FullItem(me, pDecodedItem);
    if(nReturn) {
       goto Done;