commit 4c83da08389ba86ab80bafa134c35ff91c3de8f8
author Dmitry Shmidt <dimitrysh@google.com> Mon Feb 05 23:26:20 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 05 23:26:20 2018 +0000
tree f9ec9902886809f3985c56a92d5a5dab2f4becc0
parent 86178f524f05152e6b163d0a730e966f9c9cdff6
parent eecc4372addc9387dc086a0035672c43489a856e

Merge "wpa_supplicant: Free config only if it was allocated in same call"
am: eecc4372ad

Change-Id: I346953fe3c707f8b90d0fbc8c2049b3f337a9717

wpa_supplicant/config_file.c

diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 6b7abe2..0d70850 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -397,7 +397,8 @@
 	if (f == NULL) {
 		wpa_printf(MSG_ERROR, "Failed to open config file '%s', "
 			   "error: %s", name, strerror(errno));
-		os_free(config);
+		if (config != cfgp)
+			os_free(config);
 		return NULL;
 	}