matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when JSON parsing fails

Browse Source
This commit is contained in:
jacksonmj 2012-01-25 02:14:19 +08:00 committed by Simon Robertshaw
parent a9c198dd46
commit 38124c5f6f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc.c
View File

@ -224,10 +224,10 @@ void load_presets(void)
{ {
int prefdatasize = 0, i, count; int prefdatasize = 0, i, count;
char * prefdata = file_load("powder.pref", &prefdatasize); char * prefdata = file_load("powder.pref", &prefdatasize);
if(prefdata) cJSON *root;
if(prefdata && (root = cJSON_Parse(prefdata)))
{ {
cJSON *root, *userobj, *versionobj, *tmpobj, *graphicsobj, *tmparray; cJSON *userobj, *versionobj, *tmpobj, *graphicsobj, *tmparray;
root = cJSON_Parse(prefdata);
//Read user data //Read user data
userobj = cJSON_GetObjectItem(root, "user"); userobj = cJSON_GetObjectItem(root, "user");