gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix json quoting by copying from webservices library

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35559 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-09-10 13:18:29 +00:00
parent d2972dd399
commit 30934c87eb
2 changed files with 82 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSJSONSerialization.m:
Fix quoting of string output by copying code from WebServices library.
2012-09-10 Richard Frith-Macdonald <rfm@gnu.org> 2012-09-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSJSONSerialization.m: * Source/NSJSONSerialization.m:

105
Source/NSJSONSerialization.m
View file

@ -788,38 +788,87 @@ writeObject(id obj, NSMutableString *output, NSInteger tabs)
} }
else if ([obj isKindOfClass: NSStringClass]) else if ([obj isKindOfClass: NSStringClass])
{ {
NSRange r = [obj rangeOfCharacterFromSet: escapeSet]; NSString *str = (NSString*)obj;
if (r.location != NSNotFound) unsigned length = [str length];
{
NSMutableString *str = [obj mutableCopy];
NSCharacterSet *controlSet = [NSCharacterSet controlCharacterSet];
[str replaceOccurrencesOfString: @"\\"
withString: @"\\\\"
options: 0
range: NSMakeRange(0, [str length])];
[str replaceOccurrencesOfString: @"\""
withString: @"\\\""
options: 0
range: NSMakeRange(0, [str length])];
r = [str rangeOfCharacterFromSet: controlSet];
while (r.location != NSNotFound)
{
unichar control = [str characterAtIndex: r.location];
NSString *escaped;
escaped = [[NSString alloc] initWithFormat: @"\\u%.4d", if (length == 0)
(int)control]; {
[str replaceCharactersInRange: r [output appendString: @"\"\""];
withString: escaped];
[escaped release];
r = [str rangeOfCharacterFromSet: controlSet];
}
[output appendFormat: @"\"%@\"", str];
[str release];
} }
else else
{ {
[output appendFormat: @"\"%@\"", obj]; unsigned size = 2;
unichar *from;
unsigned i = 0;
unichar *to;
unsigned j = 0;
from = NSZoneMalloc (NSDefaultMallocZone(), sizeof(unichar) * length);
[str getCharacters: from];
for (i = 0; i < length; i++)
{
unichar c = from[i];
if (c == '"' || c == '\\' || c == '\b'
|| c == '\f' || c == '\n' || c == '\r' || c == '\t')
{
size += 2;
}
else if (c < 0x20)
{
size += 6;
}
else
{
size++;
}
}
to = NSZoneMalloc (NSDefaultMallocZone(), sizeof(unichar) * size);
to[j++] = '"';
for (i = 0; i < length; i++)
{
unichar c = from[i];
if (c == '"' || c == '\\' || c == '\b'
|| c == '\f' || c == '\n' || c == '\r' || c == '\t')
{
to[j++] = '\\';
switch (c)
{
case '\\': to[j++] = '\\'; break;
case '\b': to[j++] = 'b'; break;
case '\f': to[j++] = 'f'; break;
case '\n': to[j++] = 'n'; break;
case '\r': to[j++] = 'r'; break;
case '\t': to[j++] = 't'; break;
default: to[j++] = '"'; break;
}
}
else if (c < 0x20)
{
char buf[5];
to[j++] = '\\';
to[j++] = 'u';
sprintf(buf, "%04x", c);
to[j++] = buf[0];
to[j++] = buf[1];
to[j++] = buf[2];
to[j++] = buf[3];
}
else
{
to[j++] = c;
}
}
to[j] = '"';
str = [[NSStringClass alloc] initWithCharacters: to length: size];
NSZoneFree (NSDefaultMallocZone (), to);
NSZoneFree (NSDefaultMallocZone (), from);
[output appendString: str];
[str release];
} }
} }
else if (obj == boolN) else if (obj == boolN)