sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-13 23:41:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Use hex_decode() to parse hex settings

Browse Source 
Use hex_decode() to parse "hex" and "hexhyp" settings.  Note that this
parser is stricter than the old parser; it now requires exactly two
hex digits for each byte.  (The old parser was based upon strtoul()
and so would allow leading whitespace and a leading plus or minus
sign.)

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2013-07-12 14:45:55 +02:00
parent 076f58c4bf
commit 7774ceed2f
2 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tests/settings_test.c
View File

@@ -51,9 +51,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
ok ( storef_setting ( settings, setting, formatted ) == 0 ); \
len = fetch_setting ( settings, setting, actual, \
sizeof ( actual ) ); \
DBGC ( settings, "Stored %s \"%s\", got:\n", \
(setting)->type->name, formatted ); \
DBGC_HDA ( settings, 0, actual, len ); \
if ( len >= 0 ) { \
DBGC ( settings, "Stored %s \"%s\", got:\n", \
(setting)->type->name, formatted ); \
DBGC_HDA ( settings, 0, actual, len ); \
} else { \
DBGC ( settings, "Stored %s \"%s\", got error %s\n", \
(setting)->type->name, formatted, \
strerror ( len ) ); \
} \
ok ( len == ( int ) sizeof ( actual ) ); \
ok ( memcmp ( actual, expected, sizeof ( actual ) ) == 0 ); \
} while ( 0 )
@@ -239,10 +245,6 @@ static void settings_test_exec ( void ) {
RAW ( 0xf2, 0x37, 0xb2, 0x18 ), "0xf237b218" );
/* "hex" setting type */
storef_ok ( &test_settings, &test_hex_setting,
":", RAW ( 0x00, 0x00 ) );
storef_ok ( &test_settings, &test_hex_setting,
"1:2:", RAW ( 0x01, 0x02, 0x00 ) );
storef_ok ( &test_settings, &test_hex_setting,
"08:12:f5:22:90:1b:4b:47:a8:30:cb:4d:67:4c:d6:76",
RAW ( 0x08, 0x12, 0xf5, 0x22, 0x90, 0x1b, 0x4b, 0x47, 0xa8,