gnustep/libs-steptalk
0
0
Fork 0
mirror of https://github.com/gnustep/libs-steptalk.git synced 2025-02-21 02:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent out of range accesses for the input string in the Smalltalk

Browse source 
source reader.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@36773 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2013-06-30 17:13:05 +00:00
parent c046955909
commit 4298e255e7
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Languages/Smalltalk/ChangeLog
View file

@ -3,6 +3,9 @@
* STSourceReader.m (-lineNumberForIndex:, -readNextToken): Tidy
source.
* STSourceReader.m (-readNextToken): Prevent out of range accesses for
the input string.
2013-05-26 Wolfgang Lux <wolfgang.lux@gmail.com>
* STGrammar.y (temporaries): Allow empty list.

45
Languages/Smalltalk/STSourceReader.m
View file

@ -472,6 +472,12 @@ static NSString *_STNormalizeStringToken(NSString *token)
}
else if ([symbolicSelectorCharacterSet characterIsMember:c])
{
if (AT_END)
{
tokenRange = NSMakeRange(start, 1);
return STBinarySelectorTokenType;
}
c = PEEK_CHAR;
if ([symbolicSelectorCharacterSet characterIsMember:c])
{
@ -487,7 +493,6 @@ static NSString *_STNormalizeStringToken(NSString *token)
switch (c)
{
case '$':
c = GET_CHAR;
if (AT_END)
{
tokenRange = NSMakeRange(start, 1);
@ -496,15 +501,19 @@ static NSString *_STNormalizeStringToken(NSString *token)
return STErrorTokenType;
}
c = GET_CHAR;
if ([validCharacterCharacterSet characterIsMember:c])
{
c = PEEK_CHAR;
if ([identCharacterSet characterIsMember:c])
if (!AT_END)
{
tokenRange = NSMakeRange(start, 3);
[NSException raise:STCompilerSyntaxException
format:@"Too many characters"];
return STErrorTokenType;
c = PEEK_CHAR;
if ([identCharacterSet characterIsMember:c])
{
tokenRange = NSMakeRange(start, 3);
[NSException raise:STCompilerSyntaxException
format:@"Too many characters"];
return STErrorTokenType;
}
}
tokenRange = NSMakeRange(srcOffset++, 1);
@ -517,6 +526,12 @@ static NSString *_STNormalizeStringToken(NSString *token)
return STErrorTokenType;
case '#':
if (AT_END)
{
tokenRange = NSMakeRange(start, 1);
return STSharpTokenType;
}
c = PEEK_CHAR;
if (c == '(')
{
@ -527,21 +542,28 @@ static NSString *_STNormalizeStringToken(NSString *token)
if ([identStartCharacterSet characterIsMember:c])
{
start = srcOffset++;
while ([identCharacterSet characterIsMember:c] || c == ':')
srcOffset++;
do
{
c = GET_CHAR;
if (AT_END)
break;
c = GET_CHAR;
}
while ([identCharacterSet characterIsMember:c] || c == ':');
srcOffset--;
tokenRange = NSMakeRange(start, srcOffset - start);
tokenRange = NSMakeRange(start + 1, srcOffset - start - 1);
return STSymbolTokenType;
}
tokenRange = NSMakeRange(start, 1);
return STSharpTokenType;
case ':':
if (AT_END)
{
tokenRange = NSMakeRange(start, 1);
return STColonTokenType;
}
c = PEEK_CHAR;
if (c == '=')
{
@ -549,6 +571,7 @@ static NSString *_STNormalizeStringToken(NSString *token)
tokenRange = NSMakeRange(start, 2);
return STAssignTokenType;
}
tokenRange = NSMakeRange(start, 1);
return STColonTokenType;