X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fprdbg.c;h=1b376f485fecf04303d39b6240c1475e65e8dfa9;hb=b6fb30eda72b7fc3a6214ed2787f80971f66810d;hp=78a8fc7511ffc9a971d7eb4191c8c363a5bef2c5;hpb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/prdbg.c b/binutils/prdbg.c index 78a8fc7511..1b376f485f 100644 --- a/binutils/prdbg.c +++ b/binutils/prdbg.c @@ -1,6 +1,5 @@ /* prdbg.c -- Print out generic debugging information. - Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009 Free Software Foundation, Inc. + Copyright (C) 1995-2020 Free Software Foundation, Inc. Written by Ian Lance Taylor . Tags style generation written by Salvador E. Tropea . @@ -287,12 +286,15 @@ static const struct debug_write_fns tg_fns = pr_end_function, /* Same, does nothing. */ tg_lineno }; + +static int demangle_flags = DMGL_ANSI | DMGL_PARAMS; /* Print out the generic debugging information recorded in dhandle. */ bfd_boolean print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms, - void *demangler, bfd_boolean as_tags) + char * (*demangler) (struct bfd *, const char *, int), + bfd_boolean as_tags) { struct pr_handle info; @@ -303,7 +305,7 @@ print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms, info.filename = NULL; info.abfd = abfd; info.syms = syms; - info.demangler = (char * (*)(struct bfd *, const char *, int)) demangler; + info.demangler = demangler; if (as_tags) { @@ -581,7 +583,7 @@ static bfd_boolean pr_int_type (void *p, unsigned int size, bfd_boolean unsignedp) { struct pr_handle *info = (struct pr_handle *) p; - char ab[10]; + char ab[40]; sprintf (ab, "%sint%d", unsignedp ? "u" : "", size * 8); return push_type (info, ab); @@ -593,7 +595,7 @@ static bfd_boolean pr_float_type (void *p, unsigned int size) { struct pr_handle *info = (struct pr_handle *) p; - char ab[10]; + char ab[40]; if (size == 4) return push_type (info, "float"); @@ -623,7 +625,7 @@ static bfd_boolean pr_bool_type (void *p, unsigned int size) { struct pr_handle *info = (struct pr_handle *) p; - char ab[10]; + char ab[40]; sprintf (ab, "bool%d", size * 8); @@ -672,7 +674,7 @@ pr_enum_type (void *p, const char *tag, const char **names, if (values[i] != val) { - char ab[20]; + char ab[22]; print_vma (values[i], ab, FALSE, FALSE); if (! append_type (info, " = ") @@ -731,10 +733,16 @@ pr_function_type (void *p, int argcount, bfd_boolean varargs) for (i = argcount - 1; i >= 0; i--) { if (! substitute_type (info, "")) - return FALSE; + { + free (arg_types); + return FALSE; + } arg_types[i] = pop_type (info); if (arg_types[i] == NULL) - return FALSE; + { + free (arg_types); + return FALSE; + } len += strlen (arg_types[i]) + 2; } if (varargs) @@ -796,7 +804,7 @@ static bfd_boolean pr_range_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper) { struct pr_handle *info = (struct pr_handle *) p; - char abl[20], abu[20]; + char abl[22], abu[22]; assert (info->stack != NULL); @@ -821,7 +829,7 @@ pr_array_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper, { struct pr_handle *info = (struct pr_handle *) p; char *range_type; - char abl[20], abu[20], ab[50]; + char abl[22], abu[22], ab[50]; range_type = pop_type (info); if (range_type == NULL) @@ -952,10 +960,16 @@ pr_method_type (void *p, bfd_boolean domain, int argcount, bfd_boolean varargs) for (i = argcount - 1; i >= 0; i--) { if (! substitute_type (info, "")) - return FALSE; + { + free (arg_types); + return FALSE; + } arg_types[i] = pop_type (info); if (arg_types[i] == NULL) - return FALSE; + { + free (arg_types); + return FALSE; + } len += strlen (arg_types[i]) + 2; } if (varargs) @@ -1139,7 +1153,7 @@ pr_struct_field (void *p, const char *name, bfd_vma bitpos, bfd_vma bitsize, enum debug_visibility visibility) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20]; + char ab[22]; char *t; if (! substitute_type (info, name)) @@ -1323,7 +1337,7 @@ pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean is_virtual, struct pr_handle *info = (struct pr_handle *) p; char *t; const char *prefix; - char ab[20]; + char ab[22]; char *s, *l, *n; assert (info->stack != NULL && info->stack->next != NULL); @@ -1483,7 +1497,7 @@ pr_class_method_variant (void *p, const char *physname, return FALSE; if (context || voffset != 0) { - char ab[20]; + char ab[22]; if (context) { @@ -1590,7 +1604,7 @@ pr_tag_type (void *p, const char *name, unsigned int id, { struct pr_handle *info = (struct pr_handle *) p; const char *t, *tag; - char idbuf[20]; + char idbuf[22]; switch (kind) { @@ -1610,7 +1624,7 @@ pr_tag_type (void *p, const char *name, unsigned int id, t = "union class "; break; default: - abort (); + /* PR 25625: Corrupt input can trigger this case. */ return FALSE; } @@ -1686,7 +1700,7 @@ static bfd_boolean pr_int_constant (void *p, const char *name, bfd_vma val) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20]; + char ab[22]; indent (info); print_vma (val, ab, FALSE, FALSE); @@ -1713,7 +1727,7 @@ pr_typed_constant (void *p, const char *name, bfd_vma val) { struct pr_handle *info = (struct pr_handle *) p; char *t; - char ab[20]; + char ab[22]; t = pop_type (info); if (t == NULL) @@ -1736,7 +1750,7 @@ pr_variable (void *p, const char *name, enum debug_var_kind kind, { struct pr_handle *info = (struct pr_handle *) p; char *t; - char ab[20]; + char ab[22]; if (! substitute_type (info, name)) return FALSE; @@ -1799,7 +1813,7 @@ pr_function_parameter (void *p, const char *name, { struct pr_handle *info = (struct pr_handle *) p; char *t; - char ab[20]; + char ab[22]; if (kind == DEBUG_PARM_REFERENCE || kind == DEBUG_PARM_REF_REG) @@ -1837,7 +1851,7 @@ static bfd_boolean pr_start_block (void *p, bfd_vma addr) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20]; + char ab[22]; if (info->parameter > 0) { @@ -1860,7 +1874,7 @@ static bfd_boolean pr_lineno (void *p, const char *filename, unsigned long lineno, bfd_vma addr) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20]; + char ab[22]; indent (info); print_vma (addr, ab, TRUE, TRUE); @@ -1875,7 +1889,7 @@ static bfd_boolean pr_end_block (void *p, bfd_vma addr) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20]; + char ab[22]; info->indent -= 2; @@ -1916,14 +1930,14 @@ find_address_in_section (bfd *abfd, asection *section, void *data) if (found) return; - if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0) + if ((bfd_section_flags (section) & SEC_ALLOC) == 0) return; - vma = bfd_get_section_vma (abfd, section); + vma = bfd_section_vma (section); if (pc < vma) return; - size = bfd_get_section_size (section); + size = bfd_section_size (section); if (pc >= vma + size) return; @@ -1981,7 +1995,7 @@ tg_enum_type (void *p, const char *tag, const char **names, struct pr_handle *info = (struct pr_handle *) p; unsigned int i; const char *name; - char ab[20]; + char ab[22]; if (! pr_enum_type (p, tag, names, values)) return FALSE; @@ -2103,6 +2117,7 @@ tg_start_class_type (void *p, const char *tag, unsigned int id, struct pr_handle *info = (struct pr_handle *) p; char *tv = NULL; const char *name; + char idbuf[20]; info->indent += 2; @@ -2117,8 +2132,6 @@ tg_start_class_type (void *p, const char *tag, unsigned int id, name = tag; else { - char idbuf[20]; - sprintf (idbuf, "%%anon%u", id); name = idbuf; } @@ -2175,17 +2188,30 @@ tg_class_static_member (void *p, const char *name, sprintf (full_name, "%s::%s", info->stack->next->type, name); if (! substitute_type (info, full_name)) - return FALSE; + { + free (full_name); + return FALSE; + } if (! prepend_type (info, "static ")) - return FALSE; + { + free (full_name); + return FALSE; + } t = pop_type (info); if (t == NULL) - return FALSE; + { + free (full_name); + return FALSE; + } if (! tg_fix_visibility (info, visibility)) - return FALSE; + { + free (t); + free (full_name); + return FALSE; + } fprintf (info->f, "%s\t%s\t0;\"\tkind:x\ttype:%s\tclass:%s\taccess:%s\n", name, info->filename, t, info->stack->type, @@ -2295,12 +2321,18 @@ tg_class_method_variant (void *p, const char *physname ATTRIBUTE_UNUSED, /* Stick the name of the method into its type. */ if (! substitute_type (info, method_name)) - return FALSE; + { + free (method_name); + return FALSE; + } /* Get the type. */ method_type = pop_type (info); if (method_type == NULL) - return FALSE; + { + free (method_name); + return FALSE; + } /* Pull off the context type if there is one. */ if (! context) @@ -2309,12 +2341,21 @@ tg_class_method_variant (void *p, const char *physname ATTRIBUTE_UNUSED, { context_type = pop_type (info); if (context_type == NULL) - return FALSE; + { + free (method_type); + free (method_name); + return FALSE; + } } /* Now the top of the stack is the class. */ if (! tg_fix_visibility (info, visibility)) - return FALSE; + { + free (method_type); + free (method_name); + free (context_type); + return FALSE; + } fprintf (info->f, "%s\t%s\t0;\"\tkind:p\ttype:%s\tclass:%s\n", method_name, info->filename, method_type, info->stack->type); @@ -2360,16 +2401,26 @@ tg_class_static_method_variant (void *p, method_name = strdup (info->stack->next->method); /* Stick the name of the method into its type. */ if (! substitute_type (info, info->stack->next->method)) - return FALSE; + { + free (method_name); + return FALSE; + } /* Get the type. */ method_type = pop_type (info); if (method_type == NULL) - return FALSE; + { + free (method_name); + return FALSE; + } /* Now the top of the stack is the class. */ if (! tg_fix_visibility (info, visibility)) - return FALSE; + { + free (method_type); + free (method_name); + return FALSE; + } fprintf (info->f, "%s\t%s\t0;\"\tkind:p\ttype:%s\tclass:%s\taccess:%s\n", method_name, info->filename, method_type, info->stack->type, @@ -2490,7 +2541,7 @@ static bfd_boolean tg_int_constant (void *p, const char *name, bfd_vma val) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20]; + char ab[22]; indent (info); print_vma (val, ab, FALSE, FALSE); @@ -2519,7 +2570,7 @@ tg_typed_constant (void *p, const char *name, bfd_vma val) { struct pr_handle *info = (struct pr_handle *) p; char *t; - char ab[20]; + char ab[22]; t = pop_type (info); if (t == NULL) @@ -2550,7 +2601,7 @@ tg_variable (void *p, const char *name, enum debug_var_kind kind, dname = NULL; if (info->demangler) - dname = info->demangler (info->abfd, name, DMGL_ANSI | DMGL_PARAMS); + dname = info->demangler (info->abfd, name, demangle_flags); from_class = NULL; if (dname != NULL) @@ -2611,7 +2662,7 @@ tg_start_function (void *p, const char *name, bfd_boolean global) dname = NULL; if (info->demangler) - dname = info->demangler (info->abfd, name, DMGL_ANSI | DMGL_PARAMS); + dname = info->demangler (info->abfd, name, demangle_flags); if (! substitute_type (info, dname ? dname : name)) return FALSE; @@ -2697,7 +2748,7 @@ static bfd_boolean tg_start_block (void *p, bfd_vma addr) { struct pr_handle *info = (struct pr_handle *) p; - char ab[20], kind, *partof; + char ab[22], kind, *partof; char *t; bfd_boolean local;