From: Michael Brown <mcb30@etherboot.org>
Date: Thu, 26 Mar 2009 09:50:52 +0000 (+0000)
Subject: [settings] Fix broken assertion in fetch_string_setting_copy()
X-Git-Tag: v0.9.8~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd32315d032dced96b359760c4d9fa495a0a72d;p=thirdparty%2Fipxe.git

[settings] Fix broken assertion in fetch_string_setting_copy()

Reported-by: Stefan Hajnoczi <stefanha@gmail.com>
---

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;
 }