From c4b0ac209b3913897c9d59b5d04d12d46df9e1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20S=C3=A1ez?= <jgarcia@zentyal.com>
Date: Fri, 24 Oct 2014 12:38:11 +0200
Subject: [PATCH] NSString:objectFromJSONString now can parse single values

Like null => [NSNull null]
---
 SoObjects/SOGo/NSString+Utilities.m | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 70fd860ab..46f42af8e 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -560,9 +560,9 @@ static int cssEscapingCount;
 - (id) objectFromJSONString
 {
   SBJsonParser *parser;
-  NSObject *object;
+  NSArray *object;
   NSError *error;
-  NSString *unescaped;
+  NSString *unescaped, *json;
 
   object = nil;
 
@@ -571,13 +571,16 @@ static int cssEscapingCount;
       parser = [SBJsonParser new];
       [parser autorelease];
       error = nil;
-      object = [parser objectWithString: self
+
+      /* Parse it this way so we can parse simple values, like "null" */
+      json = [NSString stringWithFormat: @"[%@]", self];
+      object = [parser objectWithString: json
                                   error: &error];
       if (error)
         {
           [self errorWithFormat: @"json parser: %@,"
                 @" attempting once more after unescaping...", error];
-          unescaped = [self stringByReplacingString: @"\\\\"
+          unescaped = [json stringByReplacingString: @"\\\\"
                                          withString: @"\\"];
           object = [parser objectWithString: unescaped
                                       error: &error];
@@ -591,7 +594,7 @@ static int cssEscapingCount;
         }
     }
 
-  return object;
+  return [object objectAtIndex: 0];
 }
 
 - (NSString *) asSafeSQLString