2007-09-23 Dan Williams <dcbw@redhat.com>

* libnm-util/nm-setting.c
		- Correctly dispose of settings objects if creating them from a hash
			table fails



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2860 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-09-24 04:02:52 +00:00
parent 4a7fb5f0b3
commit d9b8a5e30b
2 changed files with 14 additions and 8 deletions

View file

@ -1,3 +1,9 @@
2007-09-23 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.c
- Correctly dispose of settings objects if creating them from a hash
table fails
2007-09-23 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.c

View file

@ -424,7 +424,7 @@ nm_setting_connection_new_from_hash (GHashTable *hash)
setting = nm_setting_connection_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_connection_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -492,7 +492,7 @@ nm_setting_ip4_config_new_from_hash (GHashTable *hash)
setting = nm_setting_ip4_config_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_connection_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -579,7 +579,7 @@ nm_setting_wired_new_from_hash (GHashTable *hash)
setting = nm_setting_wired_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_connection_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -729,7 +729,7 @@ nm_setting_wireless_new_from_hash (GHashTable *hash)
setting = nm_setting_wireless_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_connection_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -1071,7 +1071,7 @@ nm_setting_wireless_security_new_from_hash (GHashTable *hash)
setting = nm_setting_wireless_security_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_connection_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -1141,7 +1141,7 @@ nm_setting_ppp_new_from_hash (GHashTable *hash)
setting = nm_setting_ppp_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_connection_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -1207,7 +1207,7 @@ nm_setting_vpn_new_from_hash (GHashTable *hash)
setting = nm_setting_vpn_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_vpn_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}
@ -1293,7 +1293,7 @@ nm_setting_vpn_properties_new_from_hash (GHashTable *hash)
setting = nm_setting_vpn_properties_new ();
if (!nm_setting_populate_from_hash (setting, hash)) {
setting_vpn_destroy (setting);
nm_setting_destroy (setting);
return NULL;
}