Commit e56b8dc8 authored by Andre Przywara's avatar Andre Przywara
Browse files

tools/fiptool: Fix UUID parsing in blob handling

Commit 03364865

 ("Make TF UUID RFC 4122 compliant") changed the scanf
parsing string to handle endianness correctly.
However that changed the number of items sscanf handles, without
adjusting the sanity check just below.

Increase the expected return value from 11 to 16 to let fiptool handle
UUIDs given as blob parameters correctly again.
Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
parent e9b77791
...@@ -271,10 +271,10 @@ static void uuid_from_str(uuid_t *u, const char *s) ...@@ -271,10 +271,10 @@ static void uuid_from_str(uuid_t *u, const char *s)
&u->node[2], &u->node[3], &u->node[2], &u->node[3],
&u->node[4], &u->node[5]); &u->node[4], &u->node[5]);
/* /*
* Given the format specifier above, we expect 11 items to be scanned * Given the format specifier above, we expect 16 items to be scanned
* for a properly formatted UUID. * for a properly formatted UUID.
*/ */
if (n != 11) if (n != 16)
log_errx("Invalid UUID: %s", s); log_errx("Invalid UUID: %s", s);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment