gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

check step in function before use

Browse source
This commit is contained in:
Richard Frith-Macdonald 2018-02-06 12:51:25 +00:00
parent f7c71c695e
commit df6d65accc
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -8,6 +8,7 @@
* Source/NSMessagePort.m:
* Source/NSSocketPort.m: Log if we fail to tuirn on keepalive
* Source/NSURL.m: fix possible nul pointer dereference
* Source/NSPropertyList.m: check step before use
2018-02-05 Richard Frith-Macdonald <rfm@gnu.org>

12
Source/NSPropertyList.m
View file

@ -1842,6 +1842,10 @@ static void
OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
NSPropertyListFormat x, NSMutableData *dest)
{
if (step > 3)
{
step = 3;
}
if (NSStringClass == 0)
{
[NSPropertyListSerialization class]; // Force initialisation
@ -2457,7 +2461,7 @@ static BOOL classInitialized = NO;
if (aFormat == NSPropertyListXMLFormat_v1_0)
{
[dest appendBytes: prefix length: strlen(prefix)];
OAppend(aPropertyList, loc, 0, step > 3 ? 3 : step, aFormat, dest);
OAppend(aPropertyList, loc, 0, step, aFormat, dest);
[dest appendBytes: "</plist>" length: 8];
}
else if (aFormat == NSPropertyListGNUstepBinaryFormat)
@ -2470,7 +2474,7 @@ static BOOL classInitialized = NO;
}
else
{
OAppend(aPropertyList, loc, 0, step > 3 ? 3 : step, aFormat, dest);
OAppend(aPropertyList, loc, 0, step, aFormat, dest);
}
return dest;
}
@ -2520,12 +2524,12 @@ GSPropertyListMake(id obj, NSDictionary *loc, BOOL xml,
if (style == NSPropertyListXMLFormat_v1_0)
{
[dest appendBytes: prefix length: strlen(prefix)];
OAppend(obj, loc, 0, step > 3 ? 3 : step, style, dest);
OAppend(obj, loc, 0, step, style, dest);
[dest appendBytes: "</plist>" length: 8];
}
else
{
OAppend(obj, loc, 0, step > 3 ? 3 : step, style, dest);
OAppend(obj, loc, 0, step, style, dest);
}
tmp = [[NSString alloc] initWithData: dest encoding: NSASCIIStringEncoding];
[*str appendString: tmp];