diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-09-03 13:22:50 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-09-03 15:27:42 +0200 |
| commit | 6b543fecde7a1d17c1b233fc9bfa3b4c308c933a (patch) | |
| tree | d3ceda915526d1e8e730aa3d6b3d9ad3ad4a5323 | |
| parent | 68bab66b80eeeb7edb61e8c7b7f7088c804b6d5f (diff) | |
| download | NetworkManager-th/lr/initrd-ofw.tar.gz | |
fixup! initrd: add devicetree supportth/lr/initrd-ofw
Don't leak.
| -rw-r--r-- | src/initrd/nmi-dt-reader.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c index 05857f7213..5e6543f58d 100644 --- a/src/initrd/nmi-dt-reader.c +++ b/src/initrd/nmi-dt-reader.c @@ -138,9 +138,8 @@ nmi_dt_reader_parse (const char *sysfs_dir) const char *s_ipaddr = NULL; const char *s_netmask = NULL; const char *s_gateway = NULL; - NMIPAddress *ipaddr = NULL; - NMIPAddress *netmask = NULL; - NMIPAddress *gateway = NULL; + nm_auto_unref_ip_address NMIPAddress *ipaddr = NULL; + nm_auto_unref_ip_address NMIPAddress *gateway = NULL; const char *duplex = NULL; gs_free char *hwaddr = NULL; gs_free char *local_hwaddr = NULL; @@ -289,6 +288,8 @@ nmi_dt_reader_parse (const char *sysfs_dir) bootp = TRUE; if (!bootp) { + nm_auto_unref_ip_address NMIPAddress *netmask = NULL; + netmask = dt_get_ipaddr_property (base, "chosen", "netmask-ip", &family); gateway = dt_get_ipaddr_property (base, "chosen", "gateway-ip", &family); if (gateway) @@ -296,9 +297,9 @@ nmi_dt_reader_parse (const char *sysfs_dir) ipaddr = dt_get_ipaddr_property (base, "chosen", "client-ip", &family); if (family == AF_UNSPEC) { - g_warn_if_fail (netmask == NULL); - g_warn_if_fail (ipaddr == NULL); - g_warn_if_fail (gateway == NULL); + nm_assert (netmask == NULL); + nm_assert (gateway == NULL); + nm_assert (ipaddr == NULL); netmask = str_addr (s_netmask, &family); ipaddr = str_addr (s_ipaddr, &family); |