git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cplus-dem.c (consume_count): If `count' wraps, return 0 and don't advance input pointer. 

* cplus-dem.c (consume_count): If `count' wraps, return 0 and
	don't advance input pointer.
	(demangle_class_name): If consume_count didn't find a count, do
	nothing.  Don't bother with `strlen' sanity check; consume_count
	does it for us.

From-SVN: r26068
This commit is contained in:
Tom Tromey 1999-03-30 16:12:25 +00:00 committed by Tom Tromey
parent 85a0b07565
commit 4cc48683f6
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libiberty/ChangeLog
View File

@ -1,3 +1,11 @@
1999-03-30 Tom Tromey <tromey@cygnus.com>
* cplus-dem.c (consume_count): If `count' wraps, return 0 and
don't advance input pointer.
(demangle_class_name): If consume_count didn't find a count, do
nothing. Don't bother with `strlen' sanity check; consume_count
does it for us.
Thu Mar 11 01:22:58 1999 Mumit Khan <khan@xraylith.wisc.edu> Thu Mar 11 01:22:58 1999 Mumit Khan <khan@xraylith.wisc.edu>
* pexecute.c (__CYGWIN32__): Rename to * pexecute.c (__CYGWIN32__): Rename to

14
libiberty/cplus-dem.c
View File

@ -428,12 +428,22 @@ static int
consume_count (type) consume_count (type)
const char **type; const char **type;
{ {
int count = 0; unsigned int count = 0;
char *save = *type;
while (isdigit ((unsigned char)**type)) while (isdigit ((unsigned char)**type))
{ {
count *= 10; count *= 10;
count += **type - '0'; count += **type - '0';
/* A sanity check. Otherwise a symbol like
`_Utf390_1__1_9223372036854775807__9223372036854775'
can cause this function to return a negative value.
In this case we just consume until the end of the string. */
if (count > strlen (*type))
{
*type = save;
return 0;
}
(*type)++; (*type)++;
} }
return (count); return (count);
@ -1946,7 +1956,7 @@ demangle_class_name (work, mangled, declp)
int success = 0; int success = 0;
n = consume_count (mangled); n = consume_count (mangled);
if ((int) strlen (*mangled) >= n) if (n > 0)
{ {
demangle_arm_hp_template (work, mangled, n, declp); demangle_arm_hp_template (work, mangled, n, declp);
success = 1; success = 1;