#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
#include "safe-ctype.h"
#include <demangle.h>
#include "libiberty.h"
+#ifndef ULONG_MAX
+#define ULONG_MAX (~0UL)
+#endif
+#ifndef UINT_MAX
+#define UINT_MAX (~0U)
+#endif
+
/* A mini string-handling package */
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)
{
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;
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)
{
}
static void
-string_prependn (string *p, const char *s, int n)
+string_prependn (string *p, const char *s, size_t n)
{
char *q;
};
/* 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 *,
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 UINT_MAX 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))
return NULL;
- (*ret) = 0;
+ unsigned long val = 0;
while (ISDIGIT (*mangled))
{
- (*ret) *= 10;
+ unsigned long digit = mangled[0] - '0';
- /* If an overflow occured when multiplying by ten, the result
- will not be a multiple of ten. */
- if ((*ret % 10) != 0)
+ /* Check for overflow. */
+ if (val > (UINT_MAX - digit) / 10)
return NULL;
- (*ret) += mangled[0] - '0';
+ val = val * 10 + digit;
mangled++;
}
- if (*mangled == '\0' || *ret < 0)
+ if (*mangled == '\0')
return NULL;
+ *ret = val;
return 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)
{
[A-Z] NumberBackRef
^
*/
- (*ret) = 0;
+ unsigned long val = 0;
while (ISALPHA (*mangled))
{
- (*ret) *= 26;
+ /* Check for overflow. */
+ if (val > (ULONG_MAX - 25) / 26)
+ break;
- /* If an overflow occured when multiplying by 26, the result
- will not be a multiple of 26. */
- if ((*ret % 26) != 0)
- return NULL;
+ val *= 26;
if (mangled[0] >= 'a' && mangled[0] <= 'z')
{
- (*ret) += mangled[0] - 'a';
+ val += mangled[0] - 'a';
+ if ((long) val <= 0)
+ break;
+ *ret = val;
return mangled + 1;
}
- (*ret) += mangled[0] - 'A';
+ val += mangled[0] - 'A';
mangled++;
}
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. */
^
*/
const char *backref;
- long len;
+ unsigned long len;
/* Get position of the back reference. */
mangled = dlang_backref (mangled, &backref, 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]);
switch (*mangled)
{
+ case 'I': /* in(T) */
+ mangled++;
+ string_append (decl, "in ");
+ if (*mangled == 'K') /* in ref(T) */
+ {
+ mangled++;
+ string_append (decl, "ref ");
+ }
+ break;
case 'J': /* out(T) */
mangled++;
string_append (decl, "out ");
mangled = dlang_function_type (decl, mangled, info);
string_append (decl, "function");
return mangled;
- case 'I': /* ident T */
case 'C': /* class T */
case 'S': /* struct T */
case 'E': /* enum T */
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;
if (endptr == NULL || len == 0)
return NULL;
- if (strlen (endptr) < (size_t) len)
+ if (strlen (endptr) < len)
return NULL;
mangled = endptr;
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)
{
char value[20];
int pos = sizeof(value);
int width = 0;
- long val;
+ unsigned long val;
mangled = dlang_number (mangled, &val);
if (mangled == NULL)
else if (type == 'b')
{
/* Parse boolean value. */
- long val;
+ unsigned long val;
mangled = dlang_number (mangled, &val);
if (mangled == NULL)
dlang_parse_string (string *decl, const char *mangled)
{
char type = *mangled;
- long len;
+ unsigned long len;
mangled++;
mangled = dlang_number (mangled, &len);
static const char *
dlang_parse_arrayliteral (string *decl, const char *mangled)
{
- long elements;
+ unsigned long elements;
mangled = dlang_number (mangled, &elements);
if (mangled == NULL)
static const char *
dlang_parse_assocarray (string *decl, const char *mangled)
{
- long elements;
+ unsigned long elements;
mangled = dlang_number (mangled, &elements);
if (mangled == NULL)
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)
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)
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)
}
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);
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;
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;
projects / deliverable / binutils-gdb.git / blobdiff