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

ifcfg-rh: fix memleak in make_ip4_setting()

Browse Source
This commit is contained in:
Thomas Haller
2015-01-28 23:02:29 +01:00
parent 9d04d62255
commit d1a0229083
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@
#include "nm-platform.h" #include "nm-platform.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-logging.h" #include "nm-logging.h"
#include "gsystem-local-alloc.h"
#include "common.h" #include "common.h"
#include "shvar.h" #include "shvar.h"
@@ -890,7 +891,7 @@ make_ip4_setting (shvarFile *ifcfg,
char *value = NULL; char *value = NULL;
char *route_path = NULL; char *route_path = NULL;
char *method; char *method;
char *gateway = NULL; gs_free char *gateway = NULL;
gint32 i; gint32 i;
shvarFile *network_ifcfg; shvarFile *network_ifcfg;
shvarFile *route_ifcfg; shvarFile *route_ifcfg;
@@ -962,7 +963,6 @@ make_ip4_setting (shvarFile *ifcfg,
(void) nm_setting_ip_config_add_address (s_ip4, addr); (void) nm_setting_ip_config_add_address (s_ip4, addr);
nm_ip_address_unref (addr); nm_ip_address_unref (addr);
g_object_set (s_ip4, NM_SETTING_IP_CONFIG_GATEWAY, gateway, NULL); g_object_set (s_ip4, NM_SETTING_IP_CONFIG_GATEWAY, gateway, NULL);
g_free (gateway);
} }
return NM_SETTING (s_ip4); return NM_SETTING (s_ip4);
} else { } else {
@@ -1012,6 +1012,8 @@ make_ip4_setting (shvarFile *ifcfg,
for (i = -1; i < 256; i++) { for (i = -1; i < 256; i++) {
NMIPAddress *addr = NULL; NMIPAddress *addr = NULL;
/* gateway will only be set if still unset. Hence, we don't leak gateway
* here by calling read_full_ip4_address() repeatedly */
if (!read_full_ip4_address (ifcfg, network_file, i, NULL, &addr, &gateway, error)) if (!read_full_ip4_address (ifcfg, network_file, i, NULL, &addr, &gateway, error))
goto done; goto done;
@@ -1144,7 +1146,6 @@ make_ip4_setting (shvarFile *ifcfg,
return NM_SETTING (s_ip4); return NM_SETTING (s_ip4);
done: done:
g_free (gateway);
g_free (route_path); g_free (route_path);
g_object_unref (s_ip4); g_object_unref (s_ip4);
return NULL; return NULL;