From: Klas Lindfors <klas@yubico.com>
Date: Thu, 26 Apr 2012 11:38:47 +0000 (+0200)
Subject: move modifying of ndef struct until after we've checked the length
X-Git-Tag: v1.7.0~1^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26bf8382c97cecdddaad90933d513b6a2dd581c3;p=yubikey-personalization

move modifying of ndef struct until after we've checked the length
---

diff --git a/ykpers.c b/ykpers.c
index c1d1338..f913c52 100644
--- a/ykpers.c
+++ b/ykpers.c
@@ -385,16 +385,16 @@ int ykp_construct_ndef_uri(YKNDEF *ndef, const char *uri)
 			break;
 		}
 	}
-	if(index > num_identifiers) {
-		ndef->data[0] = 0;
-	} else {
-		ndef->data[0] = index + 1;
-	}
 	size_t data_length = strlen(uri);
 	if(data_length + 1 > NDEF_DATA_SIZE) {
 		ykp_errno = YKP_EINVAL;
 		return 1;
 	}
+	if(index > num_identifiers) {
+		ndef->data[0] = 0;
+	} else {
+		ndef->data[0] = index + 1;
+	}
 	memcpy(ndef->data + 1, uri, data_length);
 	ndef->len = data_length + 1;
 	ndef->type = 'U';