Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix invalid use of pointer to temporary object in json2lua conversion

This commit is contained in:
sapier 2013-11-04 17:04:55 +01:00 committed by sapier
parent 7be18657b1
commit 1a96987d0f
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/convert_json.cpp
View File

@ -105,13 +105,17 @@ std::vector<ModStoreMod> readModStoreList(Json::Value& modlist) {
//id //id
if (modlist[i]["id"].asString().size()) { if (modlist[i]["id"].asString().size()) {
const char* id_raw = modlist[i]["id"].asString().c_str(); std::string id_raw = modlist[i]["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
toadd.id = numbervalue; toadd.id = numbervalue;
} }
else {
errorstream << "readModStoreList: missing id" << std::endl;
toadd.valid = false;
}
} }
else { else {
errorstream << "readModStoreList: missing id" << std::endl; errorstream << "readModStoreList: missing id" << std::endl;
@ -163,11 +167,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
ModStoreVersionEntry toadd; ModStoreVersionEntry toadd;
if (details["version_set"][i]["id"].asString().size()) { if (details["version_set"][i]["id"].asString().size()) {
const char* id_raw = details["version_set"][i]["id"].asString().c_str(); std::string id_raw = details["version_set"][i]["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
toadd.id = numbervalue; toadd.id = numbervalue;
} }
} }
@ -215,11 +219,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
if (details["categories"][i]["id"].asString().size()) { if (details["categories"][i]["id"].asString().size()) {
const char* id_raw = details["categories"][i]["id"].asString().c_str(); std::string id_raw = details["categories"][i]["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
toadd.id = numbervalue; toadd.id = numbervalue;
} }
} }
@ -248,11 +252,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
if (details["author"].isObject()) { if (details["author"].isObject()) {
if (details["author"]["id"].asString().size()) { if (details["author"]["id"].asString().size()) {
const char* id_raw = details["author"]["id"].asString().c_str(); std::string id_raw = details["author"]["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
retval.author.id = numbervalue; retval.author.id = numbervalue;
} }
else { else {
@ -282,11 +286,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
if (details["license"].isObject()) { if (details["license"].isObject()) {
if (details["license"]["id"].asString().size()) { if (details["license"]["id"].asString().size()) {
const char* id_raw = details["license"]["id"].asString().c_str(); std::string id_raw = details["license"]["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
retval.license.id = numbervalue; retval.license.id = numbervalue;
} }
} }
@ -313,11 +317,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
if (details["titlepic"].isObject()) { if (details["titlepic"].isObject()) {
if (details["titlepic"]["id"].asString().size()) { if (details["titlepic"]["id"].asString().size()) {
const char* id_raw = details["titlepic"]["id"].asString().c_str(); std::string id_raw = details["titlepic"]["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
retval.titlepic.id = numbervalue; retval.titlepic.id = numbervalue;
} }
} }
@ -332,11 +336,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
if (details["titlepic"]["mod"].asString().size()) { if (details["titlepic"]["mod"].asString().size()) {
const char* mod_raw = details["titlepic"]["mod"].asString().c_str(); std::string mod_raw = details["titlepic"]["mod"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(mod_raw,&endptr,10); int numbervalue = strtol(mod_raw.c_str(),&endptr,10);
if ((*mod_raw != 0) && (*endptr == 0)) { if ((mod_raw != "") && (*endptr == 0)) {
retval.titlepic.mod = numbervalue; retval.titlepic.mod = numbervalue;
} }
} }
@ -345,11 +349,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
//id //id
if (details["id"].asString().size()) { if (details["id"].asString().size()) {
const char* id_raw = details["id"].asString().c_str(); std::string id_raw = details["id"].asString();
char* endptr = 0; char* endptr = 0;
int numbervalue = strtol(id_raw,&endptr,10); int numbervalue = strtol(id_raw.c_str(),&endptr,10);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
retval.id = numbervalue; retval.id = numbervalue;
} }
} }
@ -389,11 +393,11 @@ ModStoreModDetails readModStoreModDetails(Json::Value& details) {
//value //value
if (details["rating"].asString().size()) { if (details["rating"].asString().size()) {
const char* id_raw = details["rating"].asString().c_str(); std::string id_raw = details["rating"].asString();
char* endptr = 0; char* endptr = 0;
float numbervalue = strtof(id_raw,&endptr); float numbervalue = strtof(id_raw.c_str(),&endptr);
if ((*id_raw != 0) && (*endptr == 0)) { if ((id_raw != "") && (*endptr == 0)) {
retval.rating = numbervalue; retval.rating = numbervalue;
} }
} }