From 8acc7c9b34fa716be486726745a730090e2ba03f Mon Sep 17 00:00:00 2001
From: SteveToulouse <steve.toulouse@orange.fr>
Date: Thu, 7 Jul 2016 12:37:47 +0200
Subject: [PATCH 1/2] Update ESP8266WiFiMulti.cpp

Fix #2115
---
 libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
index 68e5845cf7..6cd5666443 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
@@ -191,6 +191,8 @@ bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
             free(newAP.ssid);
             return false;
         }
+    } else {
+        newAP.passphrase = strdup("");
     }
 
     APlist.push_back(newAP);

From 29cc6933253df1716ac3ae0deeaa4c34de672da7 Mon Sep 17 00:00:00 2001
From: SteveToulouse <steve.toulouse@orange.fr>
Date: Thu, 7 Jul 2016 15:02:44 +0200
Subject: [PATCH 2/2] Update ESP8266WiFiMulti.cpp

Fix #2115. Cleaner version (catch strdup("") fail).
---
 libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
index 6cd5666443..b7fba7ddb0 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
@@ -184,17 +184,18 @@ bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
         return false;
     }
 
-    if(passphrase && *passphrase != 0x00) {
+    if(passphrase) {
         newAP.passphrase = strdup(passphrase);
-        if(!newAP.passphrase) {
-            DEBUG_WIFI_MULTI("[WIFI][APlistAdd] fail newAP.passphrase == 0\n");
-            free(newAP.ssid);
-            return false;
-        }
     } else {
         newAP.passphrase = strdup("");
     }
 
+    if(!newAP.passphrase) {
+        DEBUG_WIFI_MULTI("[WIFI][APlistAdd] fail newAP.passphrase == 0\n");
+        free(newAP.ssid);
+        return false;
+    }
+
     APlist.push_back(newAP);
     DEBUG_WIFI_MULTI("[WIFI][APlistAdd] add SSID: %s\n", newAP.ssid);
     return true;