From 2ef4c1f40feaca06173b34d2301315f4772f6e79 Mon Sep 17 00:00:00 2001
From: Andrey Alekseenko <al42and@gmail.com>
Date: Fri, 21 Feb 2020 21:21:38 -0500
Subject: [PATCH] Random static analysis fixes

---
 src/dhcp/client.c           | 2 +-
 src/wifi/wifid-supplicant.c | 1 -
 src/wifi/wifid.c            | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dhcp/client.c b/src/dhcp/client.c
index 3d04cd1..7f818ba 100644
--- a/src/dhcp/client.c
+++ b/src/dhcp/client.c
@@ -2785,7 +2785,7 @@ int g_dhcp_client_start(GDHCPClient *dhcp_client, const char *last_address)
 		addr = ntohl(inet_addr(last_address));
 		if (addr == 0xFFFFFFFF) {
 			addr = 0;
-		} else {
+		} else if (dhcp_client->last_address != last_address) {  // Avoiding use-after-free
 			g_free(dhcp_client->last_address);
 			dhcp_client->last_address = g_strdup(last_address);
 		}
diff --git a/src/wifi/wifid-supplicant.c b/src/wifi/wifid-supplicant.c
index 081e79e..644f077 100644
--- a/src/wifi/wifid-supplicant.c
+++ b/src/wifi/wifid-supplicant.c
@@ -1451,7 +1451,6 @@ static void supplicant_event(struct supplicant *s, struct wpas_message *m)
 		    !strcmp(name, "WPS-AP-AVAILABLE-PIN") ||
 		    !strcmp(name, "CTRL-EVENT-EAP-STATUS") ||
 		    !strcmp(name, "CTRL-EVENT-EAP-METHOD") ||
-		    !strcmp(name, "CTRL-EVENT-EAP-STATUS") ||
 		    !strcmp(name, "WPS-CRED-RECEIVED") ||
 		    !strcmp(name, "WPS-AP-AVAILABLE") ||
 		    !strcmp(name, "WPS-REG-SUCCESS") ||
diff --git a/src/wifi/wifid.c b/src/wifi/wifid.c
index 9417fe4..4b46f64 100644
--- a/src/wifi/wifid.c
+++ b/src/wifi/wifid.c
@@ -542,6 +542,7 @@ static int parse_argv(int argc, char *argv[])
 			break;
 		case ARG_CONFIG_METHODS:
 			config_methods = optarg;
+			break;
 		case ARG_LAZY_MANAGED:
 			lazy_managed = true;
 			break;