fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 03:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-11-17 Dan Williams <dcbw@redhat.com>

Browse source 
* system-settings/plugins/ifcfg-fedora/reader.c
		- (read_mac_address): clean up
		- (make_wireless_setting): pass NULL array to read_mac_address() like it
			expects

	* system-settings/plugins/ifcfg-fedora/plugin.c
		- (read_one_connection): don't segfault on NULL errors



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4294 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-11-17 18:39:20 +00:00
parent 87452f1183
commit 43c782ac7d
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-11-17 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/ifcfg-fedora/reader.c
- (read_mac_address): clean up
- (make_wireless_setting): pass NULL array to read_mac_address() like it
expects
* system-settings/plugins/ifcfg-fedora/plugin.c
- (read_one_connection): don't segfault on NULL errors
2008-11-14 Dan Williams <dcbw@redhat.com> 2008-11-14 Dan Williams <dcbw@redhat.com>
* Tag 0.7.0-rc2 * Tag 0.7.0-rc2

2
system-settings/plugins/ifcfg-fedora/plugin.c
View file

@ -199,7 +199,7 @@ read_one_connection (SCPluginIfcfg *plugin, const char *filename)
G_CALLBACK (connection_ifcfg_changed), plugin); G_CALLBACK (connection_ifcfg_changed), plugin);
} else { } else {
PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " error: %s", PLUGIN_PRINT (IFCFG_PLUGIN_NAME, " error: %s",
error->message ? error->message : "(unknown)"); (error && error->message) ? error->message : "(unknown)");
g_error_free (error); g_error_free (error);
} }

14
system-settings/plugins/ifcfg-fedora/reader.c
View file

@ -386,24 +386,16 @@ read_mac_address (shvarFile *ifcfg, GByteArray **array, GError **error)
mac = ether_aton (value); mac = ether_aton (value);
if (!mac) { if (!mac) {
g_free (value);
g_set_error (error, ifcfg_plugin_error_quark (), 0, g_set_error (error, ifcfg_plugin_error_quark (), 0,
"The MAC address '%s' was invalid.", value); "The MAC address '%s' was invalid.", value);
goto error; return FALSE;
} }
g_free (value); g_free (value);
*array = g_byte_array_sized_new (ETH_ALEN); *array = g_byte_array_sized_new (ETH_ALEN);
g_byte_array_append (*array, (guint8 *) mac->ether_addr_octet, ETH_ALEN); g_byte_array_append (*array, (guint8 *) mac->ether_addr_octet, ETH_ALEN);
return TRUE; return TRUE;
error:
g_free (value);
if (*array) {
g_byte_array_free (*array, TRUE);
*array = NULL;
}
return FALSE;
} }
static gboolean static gboolean
@ -647,7 +639,7 @@ make_wireless_setting (shvarFile *ifcfg,
GError **error) GError **error)
{ {
NMSettingWireless *s_wireless; NMSettingWireless *s_wireless;
GByteArray *array; GByteArray *array = NULL;
char *value; char *value;
s_wireless = NM_SETTING_WIRELESS (nm_setting_wireless_new ()); s_wireless = NM_SETTING_WIRELESS (nm_setting_wireless_new ());