Fix: Make the C-APDU logic more readable

1 files changed, 11 insertions, 7 deletions

diff --git a/src/stkutil.c b/src/stkutil.c
index 7c2ddb39..13c2978b 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -820,6 +820,7 @@ static gboolean parse_dataobj_c_apdu(struct comprehension_tlv_iter *iter,
 	struct stk_c_apdu *ca = user;
 	const unsigned char *data;
 	unsigned int len = comprehension_tlv_iter_get_length(iter);
+	unsigned int pos;
 
 	if ((len < 4) || (len > 241))
 		return FALSE;
@@ -830,6 +831,8 @@ static gboolean parse_dataobj_c_apdu(struct comprehension_tlv_iter *iter,
 	ca->p1 = data[2];
 	ca->p2 = data[3];
 
+	pos = 4;
+
 	/*
 	 * lc is 0 has the same meaning as lc is absent. But le is 0 means
 	 * the maximum number of bytes expected in the response data field
@@ -840,16 +843,17 @@ static gboolean parse_dataobj_c_apdu(struct comprehension_tlv_iter *iter,
 		if (ca->lc > sizeof(ca->data))
 			return FALSE;
 
-		memcpy(ca->data, data+5, ca->lc);
+		pos += ca->lc + 1;
 
-		if ((len - ca->lc) == 6) {
-			ca->le = data[len-1];
-			ca->has_le = TRUE;
-		} else if (len - ca->lc != 5)
+		if (len - pos > 1)
 			return FALSE;
-	} else if (len == 5) {
+
+		memcpy(ca->data, data+5, ca->lc);
+	}
+	
+	if (len - pos > 0) {
 		ca->lc = 0;
-		ca->le = data[4];
+		ca->le = data[len - 1];
 		ca->has_le = TRUE;
 	}