So this one is on top of the previously posted patch.
* d-demangle.c (string_need): Take a size_t n arg, and use size_t tem.
(string_append): Use size_t n.
(string_appendn, string_prependn): Take a size_t n arg.
(TEMPLATE_LENGTH_UNKNOWN): Define as -1UL.
* d-demangle.c (dlang_number): Make "ret" an unsigned long*.
Only succeed for result of [0,4294967295UL].
(dlang_decode_backref): Only succeed for result [1,MAX_LONG].
(dlang_backref): Remove now unnecessary range check.
(dlang_symbol_name_p): Likewise.
(dlang_lname, dlang_parse_template): Take an unsigned long len
arg.
(dlang_symbol_backref, dlang_identifier, dlang_parse_integer),
(dlang_parse_integer, dlang_parse_string),
(dlang_parse_arrayliteral, dlang_parse_assocarray),
(dlang_parse_structlit, dlang_parse_tuple),
(dlang_template_symbol_param, dlang_template_args): Use
unsigned long variables.
* testsuite/d-demangle-expected: Add new tests.
diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c
index 59e6ae007a..152f620abf 100644
--- a/libiberty/d-demangle.c
+++ b/libiberty/d-demangle.c
@@ -62,9 +62,9 @@ typedef struct string /* Beware: these aren't
required to be */
} string;
static void
-string_need (string *s, int n)
+string_need (string *s, size_t n)
{
- int tem;
+ size_t tem;
if (s->b == NULL)
{
@@ -75,7 +75,7 @@ string_need (string *s, int n)
s->p = s->b = XNEWVEC (char, n);
s->e = s->b + n;
}
- else if (s->e - s->p < n)
+ else if ((size_t) (s->e - s->p) < n)
{
tem = s->p - s->b;
n += tem;
@@ -124,14 +124,14 @@ string_setlength (string *s, int n)
static void
string_append (string *p, const char *s)
{
- int n = strlen (s);
+ size_t n = strlen (s);
string_need (p, n);
memcpy (p->p, s, n);
p->p += n;
}
static void
-string_appendn (string *p, const char *s, int n)
+string_appendn (string *p, const char *s, size_t n)
{
if (n != 0)
{
@@ -142,7 +142,7 @@ string_appendn (string *p, const char *s, int n)
}
static void
-string_prependn (string *p, const char *s, int n)
+string_prependn (string *p, const char *s, size_t n)
{
char *q;
@@ -177,7 +177,7 @@ struct dlang_info
};
/* Pass as the LEN to dlang_parse_template if symbol length is not known. */
-enum { TEMPLATE_LENGTH_UNKNOWN = -1 };
+#define TEMPLATE_LENGTH_UNKNOWN (-1UL)
/* Prototypes for forward referenced functions */
static const char *dlang_function_type (string *, const char *,
@@ -200,15 +200,16 @@ static const char *dlang_parse_tuple (string *, const
char *,
struct dlang_info *);
static const char *dlang_parse_template (string *, const char *,
- struct dlang_info *, long);
+ struct dlang_info *, unsigned long);
-static const char *dlang_lname (string *, const char *, long);
+static const char *dlang_lname (string *, const char *, unsigned long);
/* Extract the number from MANGLED, and assign the result to RET.
- Return the remaining string on success or NULL on failure. */
+ Return the remaining string on success or NULL on failure.
+ A result larger than 4294967295UL is considered a failure. */
static const char *
-dlang_number (const char *mangled, long *ret)
+dlang_number (const char *mangled, unsigned long *ret)
{
/* Return NULL if trying to extract something that isn't a digit. */
if (mangled == NULL || !ISDIGIT (*mangled))
@@ -218,17 +219,17 @@ dlang_number (const char *mangled, long *ret)
while (ISDIGIT (*mangled))
{
- /* Check for overflow. Yes, we return NULL here for some digits
- that don't overflow "val * 10 + digit", but that doesn't
- matter given the later "(long) val < 0" test. */
- if (val > (ULONG_MAX - 9) / 10)
+ unsigned long digit = mangled[0] - '0';
+
+ /* Check for overflow. */
+ if (val > (4294967295UL - digit) / 10)
return NULL;
- val = val * 10 + mangled[0] - '0';
+ val = val * 10 + digit;
mangled++;
}
- if (*mangled == '\0' || (long) val < 0)
+ if (*mangled == '\0')
return NULL;
*ret = val;
@@ -280,7 +281,8 @@ dlang_call_convention_p (const char *mangled)
}
/* Extract the back reference position from MANGLED, and assign the result
- to RET. Return the remaining string on success or NULL on failure. */
+ to RET. Return the remaining string on success or NULL on failure.
+ A result <= 0 is a failure. */
static const char *
dlang_decode_backref (const char *mangled, long *ret)
{
@@ -314,6 +316,8 @@ dlang_decode_backref (const char *mangled, long *ret)
if (mangled[0] >= 'a' && mangled[0] <= 'z')
{
val += mangled[0] - 'a';
+ if ((long) val <= 0)
+ break;
*ret = val;
return mangled + 1;
}
@@ -344,7 +348,7 @@ dlang_backref (const char *mangled, const char **ret,
struct dlang_info *info)
if (mangled == NULL)
return NULL;
- if (refpos <= 0 || refpos > qpos - info->s)
+ if (refpos > qpos - info->s)
return NULL;
/* Set the position of the back reference. */
@@ -366,7 +370,7 @@ dlang_symbol_backref (string *decl, const char *mangled,
^
*/
const char *backref;
- long len;
+ unsigned long len;
/* Get position of the back reference. */
mangled = dlang_backref (mangled, &backref, info);
@@ -442,7 +446,7 @@ dlang_symbol_name_p (const char *mangled, struct dlang_info
*info)
return 0;
mangled = dlang_decode_backref (mangled + 1, &ret);
- if (mangled == NULL || ret <= 0 || ret > qref - info->s)
+ if (mangled == NULL || ret > qref - info->s)
return 0;
return ISDIGIT (qref[-ret]);
@@ -992,7 +996,7 @@ dlang_type (string *decl, const char *mangled, struct
dlang_info *info)
static const char *
dlang_identifier (string *decl, const char *mangled, struct dlang_info *info)
{
- long len;
+ unsigned long len;
if (mangled == NULL || *mangled == '\0')
return NULL;
@@ -1010,7 +1014,7 @@ dlang_identifier (string *decl, const char *mangled,
struct dlang_info *info)
if (endptr == NULL || len == 0)
return NULL;
- if (strlen (endptr) < (size_t) len)
+ if (strlen (endptr) < len)
return NULL;
mangled = endptr;
@@ -1027,7 +1031,7 @@ dlang_identifier (string *decl, const char *mangled,
struct dlang_info *info)
with special treatment for some magic compiler generted symbols.
Return the remaining string on success or NULL on failure. */
static const char *
-dlang_lname (string *decl, const char *mangled, long len)
+dlang_lname (string *decl, const char *mangled, unsigned long len)
{
switch (len)
{
@@ -1126,7 +1130,7 @@ dlang_parse_integer (string *decl, const char *mangled,
char type)
char value[20];
int pos = sizeof(value);
int width = 0;
- long val;
+ unsigned long val;
mangled = dlang_number (mangled, &val);
if (mangled == NULL)
@@ -1182,7 +1186,7 @@ dlang_parse_integer (string *decl, const char *mangled,
char type)
else if (type == 'b')
{
/* Parse boolean value. */
- long val;
+ unsigned long val;
mangled = dlang_number (mangled, &val);
if (mangled == NULL)
@@ -1301,7 +1305,7 @@ static const char *
dlang_parse_string (string *decl, const char *mangled)
{
char type = *mangled;
- long len;
+ unsigned long len;
mangled++;
mangled = dlang_number (mangled, &len);
@@ -1365,7 +1369,7 @@ dlang_parse_string (string *decl, const char *mangled)
static const char *
dlang_parse_arrayliteral (string *decl, const char *mangled)
{
- long elements;
+ unsigned long elements;
mangled = dlang_number (mangled, &elements);
if (mangled == NULL)
@@ -1391,7 +1395,7 @@ dlang_parse_arrayliteral (string *decl, const char
*mangled)
static const char *
dlang_parse_assocarray (string *decl, const char *mangled)
{
- long elements;
+ unsigned long elements;
mangled = dlang_number (mangled, &elements);
if (mangled == NULL)
@@ -1422,7 +1426,7 @@ dlang_parse_assocarray (string *decl, const char *mangled)
static const char *
dlang_parse_structlit (string *decl, const char *mangled, const char *name)
{
- long args;
+ unsigned long args;
mangled = dlang_number (mangled, &args);
if (mangled == NULL)
@@ -1649,7 +1653,7 @@ dlang_parse_qualified (string *decl, const char *mangled,
static const char *
dlang_parse_tuple (string *decl, const char *mangled, struct dlang_info *info)
{
- long elements;
+ unsigned long elements;
mangled = dlang_number (mangled, &elements);
if (mangled == NULL)
@@ -1684,7 +1688,7 @@ dlang_template_symbol_param (string *decl, const char
*mangled,
if (*mangled == 'Q')
return dlang_parse_qualified (decl, mangled, info, 0);
- long len;
+ unsigned long len;
const char *endptr = dlang_number (mangled, &len);
if (endptr == NULL || len == 0)
@@ -1797,12 +1801,12 @@ dlang_template_args (string *decl, const char *mangled,
struct dlang_info *info)
}
case 'X': /* Externally mangled parameter. */
{
- long len;
+ unsigned long len;
const char *endptr;
mangled++;
endptr = dlang_number (mangled, &len);
- if (endptr == NULL || strlen (endptr) < (size_t) len)
+ if (endptr == NULL || strlen (endptr) < len)
return NULL;
string_appendn (decl, endptr, len);
@@ -1822,7 +1826,7 @@ dlang_template_args (string *decl, const char *mangled,
struct dlang_info *info)
Returns the remaining signature on success or NULL on failure. */
static const char *
dlang_parse_template (string *decl, const char *mangled,
- struct dlang_info *info, long len)
+ struct dlang_info *info, unsigned long len)
{
const char *start = mangled;
string args;
@@ -1858,7 +1862,9 @@ dlang_parse_template (string *decl, const char *mangled,
string_delete (&args);
/* Check for template name length mismatch. */
- if (len != TEMPLATE_LENGTH_UNKNOWN && mangled && (mangled - start) != len)
+ if (len != TEMPLATE_LENGTH_UNKNOWN
+ && mangled
+ && (unsigned long) (mangled - start) != len)
return NULL;
return mangled;
diff --git a/libiberty/testsuite/d-demangle-expected
b/libiberty/testsuite/d-demangle-expected
index e3f32e31d7..97bcdd5978 100644
--- a/libiberty/testsuite/d-demangle-expected
+++ b/libiberty/testsuite/d-demangle-expected
@@ -1140,6 +1140,14 @@ _D4test34__T3barVG3uw3_616263VG3wd3_646566Z1xi
test.bar!("abc"w, "def"d).x
#
--format=dlang
+_D4test21__T3funVwi4294967295Z3funFNaNbNiNfZv
+test.fun!('\Uffffffff').fun()
+#
+--format=dlang
+_D4test21__T3funVwi4294967296Z3funFNaNbNiNfZv
+_D4test21__T3funVwi4294967296Z3funFNaNbNiNfZv
+#
+--format=dlang
_D6plugin8generateFiiZAya
plugin.generate(int, int)
#
--
Alan Modra
Australia Development Lab, IBM
