diff options
| author | Michael Brown | 2009-03-26 10:50:52 +0100 |
|---|---|---|
| committer | Michael Brown | 2009-03-26 10:50:52 +0100 |
| commit | 5bd32315d032dced96b359760c4d9fa495a0a72d (patch) | |
| tree | 1ae2a1dbd947574d14e9288e2c77573a586ca581 /src | |
| parent | [build] Enable building with the Intel C compiler (icc) (diff) | |
| download | ipxe-5bd32315d032dced96b359760c4d9fa495a0a72d.tar.gz ipxe-5bd32315d032dced96b359760c4d9fa495a0a72d.tar.xz ipxe-5bd32315d032dced96b359760c4d9fa495a0a72d.zip | |
[settings] Fix broken assertion in fetch_string_setting_copy()
Reported-by: Stefan Hajnoczi <stefanha@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/settings.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/settings.c b/src/core/settings.c index 55f963835..b00c0d079 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -448,7 +448,7 @@ int fetch_string_setting_copy ( struct settings *settings, struct setting *setting, char **data ) { int len; - int check_len; + int check_len = 0; len = fetch_setting_len ( settings, setting ); if ( len < 0 ) @@ -458,7 +458,8 @@ int fetch_string_setting_copy ( struct settings *settings, if ( ! *data ) return -ENOMEM; - fetch_string_setting ( settings, setting, *data, ( len + 1 ) ); + check_len = fetch_string_setting ( settings, setting, *data, + ( len + 1 ) ); assert ( check_len == len ); return len; } |