diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-01-24 18:14:19 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:33:22 (GMT) |
| commit | 38124c5f6f58f6e40a4bef0c0cbc0add74cf6557 (patch) | |
| tree | 30d4a7d56b7e7b0e1108f027db32c2f60d10777c /src | |
| parent | a9c198dd469579711043838f5960283ed848c471 (diff) | |
| download | powder-38124c5f6f58f6e40a4bef0c0cbc0add74cf6557.zip powder-38124c5f6f58f6e40a4bef0c0cbc0add74cf6557.tar.gz | |
Fix crash when JSON parsing fails
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -224,10 +224,10 @@ void load_presets(void) { int prefdatasize = 0, i, count; char * prefdata = file_load("powder.pref", &prefdatasize); - if(prefdata) + cJSON *root; + if(prefdata && (root = cJSON_Parse(prefdata))) { - cJSON *root, *userobj, *versionobj, *tmpobj, *graphicsobj, *tmparray; - root = cJSON_Parse(prefdata); + cJSON *userobj, *versionobj, *tmpobj, *graphicsobj, *tmparray; //Read user data userobj = cJSON_GetObjectItem(root, "user"); |