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

gnustep ptext property list format improvements.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38952 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-08-30 06:59:34 +00:00
parent 00571cd74e
commit 3f2fa9ddfe
2 changed files with 120 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,9 @@
2015-08-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSOperation.m: Fix potential deadlock with adding observers.
* Source/NSPropertyList.m: Fix a few mutability errors. Improve
parsing NSData performance. Add support for parsing base64 encoded
data in text property lists (delimited by <[ and ]>).
2015-08-29 Richard Frith-Macdonald <rfm@gnu.org>

148
Source/NSPropertyList.m
View file

@ -865,8 +865,8 @@ static inline id parseQuotedString(pldata* pld)
NSZoneFree(NSDefaultMallocZone(), temp);
length = k;
if (pld->key ==
NO && pld->opt == NSPropertyListMutableContainersAndLeaves)
if (pld->key == NO
&& pld->opt == NSPropertyListMutableContainersAndLeaves)
{
obj = [GSMutableString alloc];
obj = [obj initWithCharactersNoCopy: chars
@ -875,7 +875,7 @@ static inline id parseQuotedString(pldata* pld)
}
else
{
obj = [GSMutableString alloc];
obj = [NSStringClass allocWithZone: NSDefaultMallocZone()];
obj = [obj initWithCharactersNoCopy: chars
length: length
freeWhenDone: YES];
@ -907,7 +907,8 @@ static inline id parseUnquotedString(pldata *pld)
chars[i] = pld->ptr[start + i];
}
if (pld->key == NO && pld->opt == NSPropertyListMutableContainersAndLeaves)
if (pld->key == NO
&& pld->opt == NSPropertyListMutableContainersAndLeaves)
{
obj = [GSMutableString alloc];
obj = [obj initWithCharactersNoCopy: chars
@ -916,7 +917,7 @@ static inline id parseUnquotedString(pldata *pld)
}
else
{
obj = [GSMutableString alloc];
obj = [NSStringClass allocWithZone: NSDefaultMallocZone()];
obj = [obj initWithCharactersNoCopy: chars
length: length
freeWhenDone: YES];
@ -1189,15 +1190,104 @@ static id parsePlItem(pldata* pld)
}
pld->pos++;
}
else if (pld->pos < pld->end && pld->ptr[pld->pos] == '[')
{
const unsigned char *ptr;
unsigned min;
unsigned len;
pld->old = NO;
pld->pos++;
min = pld->pos;
ptr = &(pld->ptr[min]);
while (pld->pos < pld->end && pld->ptr[pld->pos] != ']')
{
pld->pos++;
}
len = pld->pos - min;
if (pld->pos >= pld->end)
{
pld->err = @"unexpected end of string when parsing data";
return nil;
}
pld->pos++;
if (pld->pos >= pld->end)
{
pld->err = @"unexpected end of string when parsing ']>'";
return nil;
}
if (pld->ptr[pld->pos] != '>')
{
pld->err = @"unexpected character (wanted '>')";
return nil;
}
pld->pos++;
if (0 == len)
{
if (pld->key == NO
&& pld->opt == NSPropertyListMutableContainersAndLeaves)
{
result = [NSMutableData new];
}
else
{
result = [NSData new];
}
}
else
{
NSData *d;
d = [[NSData alloc] initWithBytesNoCopy: (void*)ptr
length: len
freeWhenDone: NO];
NS_DURING
{
if (pld->key == NO
&& pld->opt == NSPropertyListMutableContainersAndLeaves)
{
result = [[NSMutableData alloc]
initWithBase64EncodedData: d
options: NSDataBase64DecodingIgnoreUnknownCharacters];
}
else
{
result = [[NSData alloc]
initWithBase64EncodedData: d
options: NSDataBase64DecodingIgnoreUnknownCharacters];
}
}
NS_HANDLER
{
pld->err = @"invalid base64 data";
result = nil;
}
NS_ENDHANDLER
RELEASE(d);
}
}
else
{
NSMutableData *data;
unsigned max = pld->end - 1;
unsigned char buf[BUFSIZ];
unsigned len = 0;
unsigned max = pld->pos;
unsigned char *buf;
unsigned len = 0;
data = [[NSMutableData alloc] initWithCapacity: 0];
while (max < pld->end && pld->ptr[max] != '>')
{
if (isxdigit(pld->ptr[max]))
{
len++;
}
max++;
}
if (max >= pld->end)
{
pld->err = @"unexpected end of string when parsing data";
return nil;
}
buf = NSZoneMalloc(NSDefaultMallocZone(), (len + 1) / 2);
skipSpace(pld);
len = 0;
while (pld->pos < max
&& isxdigit(pld->ptr[pld->pos])
&& isxdigit(pld->ptr[pld->pos+1]))
@ -1209,32 +1299,28 @@ static id parsePlItem(pldata* pld)
byte |= char2num(pld->ptr[pld->pos]);
pld->pos++;
buf[len++] = byte;
if (len == sizeof(buf))
{
[data appendBytes: buf length: len];
len = 0;
}
skipSpace(pld);
}
if (pld->pos >= pld->end)
{
pld->err = @"unexpected end of string when parsing data";
RELEASE(data);
return nil;
}
if (pld->ptr[pld->pos] != '>')
{
if (pld->ptr[pld->pos] != '>')
{
NSZoneFree(NSDefaultMallocZone(), buf);
pld->err = @"unexpected character (wanted '>')";
RELEASE(data);
return nil;
}
if (len > 0)
{
[data appendBytes: buf length: len];
}
}
pld->pos++;
// FIXME ... should be immutable sometimes.
result = data;
if (pld->key == NO
&& pld->opt == NSPropertyListMutableContainersAndLeaves)
{
result = [[NSMutableData alloc] initWithBytesNoCopy: buf
length: len
freeWhenDone: YES];
}
else
{
result = [[NSData alloc] initWithBytesNoCopy: buf
length: len
freeWhenDone: YES];
}
}
break;