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

Property list bugfix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3690 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-02-11 11:05:17 +00:00
parent 9ec5172f86
commit 060df65e30
2 changed files with 93 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Feb 11 9:51:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSString.m: Fixed error in property-list parsing - was not
taking into account octal and hexadecimal escape sequences.
Thu Feb 11 9:51:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk> Thu Feb 11 9:51:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSUserDefaults.m: ([-dealloc]) invalidate timer so we can't * Source/NSUserDefaults.m: ([-dealloc]) invalidate timer so we can't

105
Source/NSString.m
View file

@ -2970,8 +2970,9 @@ static BOOL skipSpace(pldata *pld)
static inline id parseQuotedString(pldata* pld) static inline id parseQuotedString(pldata* pld)
{ {
unsigned start = ++pld->pos; unsigned start = ++pld->pos;
BOOL escaped = NO; unsigned escaped = 0;
unsigned shrink = 0; unsigned shrink = 0;
BOOL hex = NO;
NSString *obj; NSString *obj;
while (pld->pos < pld->end) while (pld->pos < pld->end)
@ -2980,13 +2981,44 @@ static inline id parseQuotedString(pldata* pld)
if (escaped) if (escaped)
{ {
escaped = NO; if (escaped == 1 && c == '0')
{
escaped = 2;
hex = NO;
}
else if (escaped > 1)
{
if (escaped == 2 && c == 'x')
{
hex = YES;
shrink++;
escaped++;
}
else if (hex && (*hexdigitsImp)(hexdigits, cMemberSel, c))
{
shrink++;
escaped++;
}
else if (c >= '0' && c <= '7')
{
shrink++;
escaped++;
}
else
{
escaped = 0;
}
}
else
{
escaped = 0;
}
} }
else else
{ {
if (c == '\\') if (c == '\\')
{ {
escaped = YES; escaped = 1;
shrink++; shrink++;
} }
else if (c == '"') else if (c == '"')
@ -3009,29 +3041,68 @@ static inline id parseQuotedString(pldata* pld)
unsigned j; unsigned j;
unsigned k; unsigned k;
escaped = 0;
hex = NO;
for (j = start, k = 0; j < pld->pos; j++) for (j = start, k = 0; j < pld->pos; j++)
{ {
chars[k] = pld->ptr[j]; unichar c = pld->ptr[j];
if (escaped) if (escaped)
{ {
escaped = NO; if (escaped == 1 && c == '0')
switch (chars[k])
{ {
case 'a' : chars[k] = '\a'; break; chars[k] = 0;
case 'b' : chars[k] = '\b'; break; hex = NO;
case 't' : chars[k] = '\t'; break; escaped++;
case 'r' : chars[k] = '\r'; break; }
case 'n' : chars[k] = '\n'; break; else if (escaped > 1)
case 'v' : chars[k] = '\v'; break; {
case 'f' : chars[k] = '\f'; break; if (escaped == 2 && c == 'x')
default: break; {
hex = YES;
escaped++;
}
else if (hex && (*hexdigitsImp)(hexdigits, cMemberSel, c))
{
chars[k] <<= 4;
chars[k] |= char2num(c);
escaped++;
}
else if (c >= '0' && c <= '7')
{
chars[k] <<= 3;
chars[k] |= (c - '0');
escaped++;
}
else
{
escaped = 0;
chars[++k] = c;
k++;
}
}
else
{
escaped = 0;
switch (c)
{
case 'a' : chars[k] = '\a'; break;
case 'b' : chars[k] = '\b'; break;
case 't' : chars[k] = '\t'; break;
case 'r' : chars[k] = '\r'; break;
case 'n' : chars[k] = '\n'; break;
case 'v' : chars[k] = '\v'; break;
case 'f' : chars[k] = '\f'; break;
default : chars[k] = c; break;
}
k++;
} }
k++;
} }
else else
{ {
if (chars[k] == '\\') chars[k] = c;
escaped = YES; if (c == '\\')
escaped = 1;
else else
k++; k++;
} }