From 38124c5f6f58f6e40a4bef0c0cbc0add74cf6557 Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Wed, 25 Jan 2012 02:14:19 +0800
Subject: [PATCH] Fix crash when JSON parsing fails

---
 src/misc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/misc.c b/src/misc.c
index da40b5d71..af52254d6 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -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");