SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-lib: be stricter when decoding hex strings

Browse Source 
If a hex string has an uneven length, generate an error instead of
silently assuming a trailing '0' was in place.
This commit is contained in:
Lennart Poettering
2016-12-21 19:09:31 +01:00
parent c0cee5f1e8
commit a93c4776de
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-hexdecoct.c
+5 -13
View File
@@ -87,27 +87,19 @@ static void test_undecchar(void) {
}
static void test_unhexmem(void) {
const char *hex = "efa214921";
const char *hex = "efa2149213";
const char *hex_invalid = "efa214921o";
_cleanup_free_ char *hex2 = NULL;
_cleanup_free_ void *mem = NULL;
size_t len;
assert_se(unhexmem(hex, strlen(hex), &mem, &len) == 0);
assert_se(unhexmem(hex, strlen(hex) + 1, &mem, &len) == -EINVAL);
assert_se(unhexmem(hex_invalid, strlen(hex_invalid), &mem, &len) == -EINVAL);
assert_se(unhexmem(hex, strlen(hex) + 1, &mem, &len) == -EINVAL);
assert_se(unhexmem(hex, strlen(hex) - 1, &mem, &len) == -EINVAL);
assert_se(unhexmem(hex, strlen(hex), &mem, &len) == 0);
assert_se((hex2 = hexmem(mem, len)));
free(mem);
assert_se(memcmp(hex, hex2, strlen(hex)) == 0);
free(hex2);
assert_se(unhexmem(hex, strlen(hex) - 1, &mem, &len) == 0);
assert_se((hex2 = hexmem(mem, len)));
assert_se(memcmp(hex, hex2, strlen(hex) - 1) == 0);
assert_se(streq(hex, hex2));
}
/* https://tools.ietf.org/html/rfc4648#section-10 */