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

json fixes by Larry Campbell

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37994 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2014-07-14 06:38:16 +00:00
parent 121758341b
commit 9de418dce0
3 changed files with 397 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Source/NSJSONSerialization.m
View file

@ -154,23 +154,58 @@ updateStreamBuffer(ParserState* state)
{
case NSUTF8StringEncoding:
{
int i = -1;
// Read one UTF8 character from the stream
do
NSUInteger i = 0;
NSInteger n;
n = [stream read: &bytes[0] maxLength: 1];
if (n != 1)
{
[stream read: &bytes[++i] maxLength: 1];
state->error = [stream streamError];
if (state->error == nil)
{
state->error
= [NSError errorWithDomain: NSCocoaErrorDomain
code: 0
userInfo: nil];
}
break;
}
else
{
if ((bytes[0] & 0xC0) == 0xC0)
{
for (i = 1; i <= 5; i++)
if ((bytes[0] & (0x40 >> i)) == 0)
break;
}
}
while (bytes[i] & 0xf);
if (0 == i)
{
state->buffer[0] = bytes[0];
}
else
{
str = [[NSString alloc] initWithUTF8String: (char*)bytes];
[str getCharacters: state->buffer range: NSMakeRange(0,1)];
[str release];
n = [stream read: &bytes[1] maxLength: i];
if (n == i)
{
str = [[NSString alloc] initWithUTF8String: (char*)bytes];
[str getCharacters: state->buffer
range: NSMakeRange(0,1)];
[str release];
}
else
{
state->error = [stream streamError];
if (state->error == nil)
{
state->error
= [NSError errorWithDomain: NSCocoaErrorDomain
code: 0
userInfo: nil];
}
break;
}
}
break;
}
@ -209,6 +244,7 @@ updateStreamBuffer(ParserState* state)
state->sourceIndex = -1;
state->bufferIndex = 0;
state->bufferLength = 1;
return;
}
// Use an NSString to do the character set conversion. We could do this more
// efficiently. We could also reuse the string.
@ -243,7 +279,7 @@ consumeChar(ParserState *state)
{
state->sourceIndex++;
state->bufferIndex++;
if (state->bufferIndex >= BUFFER_SIZE)
if (state->bufferIndex >= state->bufferLength)
{
state->updateBuffer(state);
}