arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-07 16:23:38 +03:00
Code

do check if ssid is an empty String ""

Browse Source 
use strdup to save some flash

#386 part 2
This commit is contained in:
Markus Sattler 2015-06-05 12:57:00 +02:00
parent c0df9b0430
commit b620060671
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
View File

@ -68,7 +68,7 @@ int ESP8266WiFiClass::begin(const char* ssid, const char *passphrase, int32_t ch
mode(WIFI_STA); mode(WIFI_STA);
} }
if(!ssid || strlen(ssid) > 31) { if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
// fail SSID to long or missing! // fail SSID to long or missing!
return WL_CONNECT_FAILED; return WL_CONNECT_FAILED;
} }
@ -154,7 +154,7 @@ void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int chan
mode(WIFI_AP); mode(WIFI_AP);
} }
if(!ssid || strlen(ssid) > 31) { if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
// fail SSID to long or missing! // fail SSID to long or missing!
return; return;
} }

10
libraries/ESP8266WiFi/src/ESP8266WiFiMulti.cpp
View File

@ -25,6 +25,7 @@
#include "ESP8266WiFiMulti.h" #include "ESP8266WiFiMulti.h"
#include <limits.h> #include <limits.h>
#include <string.h>
ESP8266WiFiMulti::ESP8266WiFiMulti() { ESP8266WiFiMulti::ESP8266WiFiMulti() {
} }
@ -151,7 +152,7 @@ bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
WifiAPlist_t newAP; WifiAPlist_t newAP;
if(!ssid || strlen(ssid) > 31) { if(!ssid || *ssid == 0x00 || strlen(ssid) > 31) {
// fail SSID to long or missing! // fail SSID to long or missing!
return false; return false;
} }
@ -161,21 +162,18 @@ bool ESP8266WiFiMulti::APlistAdd(const char* ssid, const char *passphrase) {
return false; return false;
} }
newAP.ssid = (char*) malloc((strlen(ssid) + 1)); newAP.ssid = strdup(ssid);
if(!newAP.ssid) { if(!newAP.ssid) {
return false; return false;
} }
strcpy(newAP.ssid, ssid);
if(passphrase && *passphrase != 0x00) { if(passphrase && *passphrase != 0x00) {
newAP.passphrase = (char*) malloc((strlen(passphrase) + 1)); newAP.passphrase = strdup(passphrase);
if(!newAP.passphrase) { if(!newAP.passphrase) {
free(newAP.ssid); free(newAP.ssid);
return false; return false;
} }
strcpy(newAP.passphrase, passphrase);
} }
APlist.push_back(newAP); APlist.push_back(newAP);