ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-17 00:21:31 +10:00
Code Releases Activity

Merge pull request #660 from liebman/do_param_save

Browse Source 
Fix crasahes in doParamSave() &  WiFiManagerParameter::setValue
This commit is contained in:
Shawn A
2018-07-16 07:55:39 -05:00
committed by GitHub
parent fc84e7a260 2fac07cbf0
commit 36ad6f80c4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+12 -6
View File
@@ -67,14 +67,16 @@ void WiFiManagerParameter::setValue(const char *defaultValue, int length) {
length = strlen(defaultValue); // length actual
if(_length < length){
// Serial.println("defaultValue length mismatch");
// use the length if it's longer.
_length = length;
}
_value = new char[length + 1];
for (int i = 0; i < length + 1; i++) {
_value = new char[_length + 1];
for (int i = 0; i < _length + 1; i++) {
_value[i] = 0;
}
if (defaultValue != NULL) {
strncpy(_value, defaultValue, length);
_value[length] = '\0'; // explicit null
strncpy(_value, defaultValue, _length);
_value[_length] = '\0'; // explicit null
}
}
const char* WiFiManagerParameter::getValue() {
@@ -1228,9 +1230,13 @@ void WiFiManager::doParamSave(){
break;
}
//read parameter from server
String name = (String)FPSTR(S_parampre)+(String)i;
String value;
if(server->arg((String)FPSTR(S_parampre)+(String)i) != NULL) value = server->arg((String)FPSTR(S_parampre)+(String)i).c_str();
else value = server->arg(_params[i]->getID()).c_str();
if(server->hasArg(name)) {
value = server->arg(name);
} else {
value = server->arg(_params[i]->getID());
}
//store it in params array
value.toCharArray(_params[i]->_value, _params[i]->_length+1); // length+1 null terminated