colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: fix crash for reading invalid bridge configuration

Browse Source 
Error found by coverity.

https://bugzilla.gnome.org/show_bug.cgi?id=728320

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-04-15 19:32:48 +02:00
parent 73d4edb0b7
commit 628e774ba8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/settings/plugins/ifcfg-rh/reader.c
View File

@@ -215,17 +215,16 @@ make_connection_setting (const char *file,
value = svGetValue (ifcfg, "BRIDGE", FALSE); value = svGetValue (ifcfg, "BRIDGE", FALSE);
if (value) { if (value) {
const char *bridge; const char *old_value;
if ((bridge = nm_setting_connection_get_master (s_con))) { if ((old_value = nm_setting_connection_get_master (s_con))) {
PARSE_WARNING ("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"", PARSE_WARNING ("Already configured as slave of %s. Ignoring BRIDGE=\"%s\"",
bridge, value); old_value, value);
g_free (value); } else {
}
g_object_set (s_con, NM_SETTING_CONNECTION_MASTER, value, NULL); g_object_set (s_con, NM_SETTING_CONNECTION_MASTER, value, NULL);
g_object_set (s_con, NM_SETTING_CONNECTION_SLAVE_TYPE, g_object_set (s_con, NM_SETTING_CONNECTION_SLAVE_TYPE,
NM_SETTING_BRIDGE_SETTING_NAME, NULL); NM_SETTING_BRIDGE_SETTING_NAME, NULL);
}
g_free (value); g_free (value);
} }