Parcourir la source

Fix a couple memory leaks

Found using valgrind.

Signed-hostap: Paul Stewart <pstew@chromium.org>
Paul Stewart il y a 12 ans
Parent
commit
21270bb4b3
2 fichiers modifiés avec 5 ajouts et 1 suppressions
  1. 4 1
      src/drivers/driver_nl80211.c
  2. 1 0
      wpa_supplicant/dbus/dbus_new_handlers.c

+ 4 - 1
src/drivers/driver_nl80211.c

@@ -8465,12 +8465,15 @@ static int nl80211_signal_monitor(void *priv, int threshold, int hysteresis)
 
 
 	cqm = nlmsg_alloc();
 	cqm = nlmsg_alloc();
 	if (cqm == NULL)
 	if (cqm == NULL)
-		return -1;
+		goto nla_put_failure;
 
 
 	NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_THOLD, threshold);
 	NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_THOLD, threshold);
 	NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_HYST, hysteresis);
 	NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_HYST, hysteresis);
 	nla_put_nested(msg, NL80211_ATTR_CQM, cqm);
 	nla_put_nested(msg, NL80211_ATTR_CQM, cqm);
 
 
+	nlmsg_free(cqm);
+	cqm = NULL;
+
 	if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
 	if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0)
 		return 0;
 		return 0;
 	msg = NULL;
 	msg = NULL;

+ 1 - 0
wpa_supplicant/dbus/dbus_new_handlers.c

@@ -609,6 +609,7 @@ DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message,
 out:
 out:
 	os_free(driver);
 	os_free(driver);
 	os_free(ifname);
 	os_free(ifname);
+	os_free(confname);
 	os_free(bridge_ifname);
 	os_free(bridge_ifname);
 	return reply;
 	return reply;