commit fb492ea2a327f8d9bfc5a1ef69a22074c1405590
author Laurence Lundblade <lgl@securitytheory.com> Sat May 02 11:14:07 2020 -0700
committer Laurence Lundblade <lgl@securitytheory.com> Sat May 02 11:14:07 2020 -0700
tree 38d57961d5b425442ee5563e10923dd99a3a0ae0
parent ff5bc8093384d2887c4477b2cc9f2e10d3dafa60

minor additions / fixes

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index 7304b6a..7cb7453 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -1946,14 +1946,14 @@
          return true;
       }
    } else if(Item1.uLabelType == QCBOR_TYPE_BYTE_STRING) {
-     if(Item2.uLabelType == QCBOR_TYPE_BYTE_STRING && !UsefulBuf_Compare(Item1.label.string, Item2.label.string)) {
-        return true;
-     }
-  } else if(Item1.uLabelType == QCBOR_TYPE_UINT64) {
-     if(Item2.uLabelType == QCBOR_TYPE_UINT64 && Item1.label.uint64 == Item2.label.uint64) {
-        return true;
-     }
-  }
+      if(Item2.uLabelType == QCBOR_TYPE_BYTE_STRING && !UsefulBuf_Compare(Item1.label.string, Item2.label.string)) {
+         return true;
+      }
+   } else if(Item1.uLabelType == QCBOR_TYPE_UINT64) {
+      if(Item2.uLabelType == QCBOR_TYPE_UINT64 && Item1.label.uint64 == Item2.label.uint64) {
+         return true;
+      }
+   }
    
    /* Other label types are never matched */
    return false;
@@ -1969,8 +1969,6 @@
    } else if(Item2.uLabelType == QCBOR_TYPE_ANY) {
       return true;
    }
-
-   /* Other label types are never matched */
    return false;
 }
 
@@ -1984,13 +1982,13 @@
  
  If an item was not found, its data type is set to none.
  
- TODO: type in and out is not right.
  */
 QCBORError
 GetItemsInMap(QCBORDecodeContext *pMe, QCBORItem *pItemArray, size_t *puOffset, size_t *puEndOffset)
 {
    QCBORError  nReturn;
-   
+
+   // TODO: what if pre-order cursor is not at the same level as map? This should be OK.
    if(!DecodeNesting_InMapMode(&(pMe->nesting))) {
       return QCBOR_ERR_NOT_ENTERED;
    }
@@ -2072,7 +2070,7 @@
       *puEndOffset = uEndOffset;
    }
    
-   /* Mark all the ones not found */
+   /* For all items not found, set the data type to QCBOR_TYPE_NONE */
    int        i;
    QCBORItem *pIterator;
    for(pIterator = pItemArray, i = 0; pIterator->uLabelType != 0; pIterator++, i++) {