Commit01864ad

committed

Changed to mutable char* for reading config

1 parenta9a0e7e commit01864adCopy full SHA for 01864ad

File tree

+17

-5

lines changed

+17

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ void Config::SerializeToJson(Stream* output, std::function<void(int size)> handl`
`26`	`26`	`root.printTo(*output);`
`27`	`27`	`}`
`28`	`28`
`29`		`-voidConfig::ReadFromJson(constchar* string) {`
	`29`	`+voidConfig::ReadFromJson(char* string) {`
`30`	`30`	`DynamicJsonBuffer jsonBuffer;`
`31`	`31`	`JsonObject& root = jsonBuffer.parseObject(string);`
`32`	`32`	`host = root["host"].asString();`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ struct Config {`
`31`	`31`	`Pins pins;`
`32`	`32`
`33`	`33`	`voidSerializeToJson(Stream* output, std::function<void(int size)> handle_size)const;`
`34`		`-voidReadFromJson(constchar* string);`
	`34`	`+`
	`35`	`+// We need a mutable char array here, otherwise a copy will be made.`
	`36`	`+voidReadFromJson(char* string);`
`35`	`37`	`};`
`36`	`38`
`37`	`39`	`}// namespace thing`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,9 @@ bool FireThing::ReadConfigFromStorage(Config* config) {`
`91`	`91`	`SPIFFS.end();`
`92`	`92`	`returnfalse;`
`93`	`93`	`}`
`94`		`- config->ReadFromJson(cfg.readString().c_str());`
	`94`	`+char buffer[cfg.size()];`
	`95`	`+ cfg.readBytes(buffer, cfg.size());`
	`96`	`+ config->ReadFromJson(buffer);`
`95`	`97`	`debug_("Config read from disk.");`
`96`	`98`	`}`
`97`	`99`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,16 @@ void Portal::Start(const Config& config) {`
`125`	`125`	`debug_("Config updated called without param.");`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`		`- String config = server_.arg("config");`
`129`		`- config_.ReadFromJson(config.c_str());`
	`128`	`+`
	`129`	`+char* buffer;`
	`130`	`+ {// Scoped to free String memory.`
	`131`	`+ String config = server_.arg("config");`
	`132`	`+ buffer = (char*)malloc(config.length+1());`
	`133`	`+memcpy(buffer, config.c_str(), config.length()+1);`
	`134`	`+ }`
	`135`	`+ config_.ReadFromJson(buffer);`
	`136`	`+free(buffer);`
	`137`	`+`
`130`	`138`	`callback_(config_);`
`131`	`139`	`server_.send(200,"text/plain","");`
`132`	`140`	`debug_("config updated.");`

Comments

(0)