commit 63926058683bba09aefb38b4f8ee3d3938190f2f
author Laurence Lundblade <laurencelundblade@users.noreply.github.com> Mon Mar 29 16:05:51 2021 -0700
committer GitHub <noreply@github.com> Mon Mar 29 16:05:51 2021 -0700
tree 698f89c450c469e7f66df4ef13f5ffcfa4fc2d9d
parent 49977f963ff5a8ef8df15b4f7f5838401b9a26c2

Improve error code when getting map items by label

Not-well-formed errors were being masked as not-found errors for functions like QCBORDecode_GetInt64InMapN .. for all the "InMap" functions.

src/qcbor_decode.c

diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index d1be74d..4d31b69 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -2951,14 +2951,14 @@
                uReturn = QCBOR_ERR_DUPLICATE_LABEL;
                goto Done;
             }
-            /* Also try to match its type */
-            if(!MatchType(Item, pItemArray[nIndex])) {
-               uReturn = QCBOR_ERR_UNEXPECTED_TYPE;
+            if(uResult != QCBOR_SUCCESS) {
+               /* The label matches, but the data item is in error */
+               uReturn = uResult;
                goto Done;
             }
-
-            if(uResult != QCBOR_SUCCESS) {
-               uReturn = uResult;
+            if(!MatchType(Item, pItemArray[nIndex])) {
+               /* The data item is not of the type(s) requested */
+               uReturn = QCBOR_ERR_UNEXPECTED_TYPE;
                goto Done;
             }