forked from Imagelibrary/binutils-gdb
PR27716, build failure for msdosdjgpp: PATH_MAX undeclared
We shouldn't be using arbitrary limits like PATH_MAX in GNU programs. This patch also fixes some memory leaks in readelf when processing separate debug info. PR 27716 binutils/ * objdump.c (show_line): Don't limit paths to PATH_MAX. * readelf.c (struct filedata): Change program_interpreter from a char array to a char pointer. (process_program_headers): Sanity check PT_INTERP p_filesz. Malloc program_interpreter using p_filesz and read directly from file. (process_dynamic_section): Check program_interpreter is non-NULL. (free_filedata): New function, split out from.. (process_object): ..here. (close_debug_file): Call free_filedata. * sysdep.h: Don't include sys/param.h. (PATH_MAX): Don't define. * configure.ac: Don't check for sys/param.h. * configure: Regenerate. gprof/ * gprof.h (PATH_MAX): Don't define. * corefile.c (core_create_line_syms): Don't use PATH_MAX for initial file name size. * source.c (annotate_source): Malloc file name buffer. Always trim off "-ann" when dos 8.3 annotate file matches original. * utils.c (print_name_only): Malloc file name buffer.
This commit is contained in:
@@ -1,3 +1,13 @@
|
||||
2021-04-14 Alan Modra <amodra@gmail.com>
|
||||
|
||||
PR 27716
|
||||
* gprof.h (PATH_MAX): Don't define.
|
||||
* corefile.c (core_create_line_syms): Don't use PATH_MAX for initial
|
||||
file name size.
|
||||
* source.c (annotate_source): Malloc file name buffer. Always
|
||||
trim off "-ann" when dos 8.3 annotate file matches original.
|
||||
* utils.c (print_name_only): Malloc file name buffer.
|
||||
|
||||
2021-04-05 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure.ac: Check for sys/time.h and setitimer. Don't invoke
|
||||
|
||||
@@ -781,8 +781,8 @@ core_create_line_syms (void)
|
||||
|
||||
Of course, this is rather slow and it would be better if
|
||||
BFD would provide an iterator for enumerating all line infos. */
|
||||
prev_name_len = PATH_MAX;
|
||||
prev_filename_len = PATH_MAX;
|
||||
prev_name_len = 1024;
|
||||
prev_filename_len = 1024;
|
||||
prev_name = (char *) xmalloc (prev_name_len);
|
||||
prev_filename = (char *) xmalloc (prev_filename_len);
|
||||
ltab.len = 0;
|
||||
|
||||
@@ -54,10 +54,6 @@
|
||||
/* AIX defines hz as a macro. */
|
||||
#undef hz
|
||||
|
||||
#ifndef PATH_MAX
|
||||
#define PATH_MAX 1024
|
||||
#endif
|
||||
|
||||
#define A_OUTNAME "a.out" /* default core filename */
|
||||
#define GMONNAME "gmon.out" /* default profile filename */
|
||||
#define GMONSUM "gmon.sum" /* profile summary filename */
|
||||
|
||||
@@ -97,14 +97,14 @@ annotate_source (Source_File *sf, unsigned int max_width,
|
||||
int i, line_num, nread;
|
||||
bool new_line;
|
||||
char buf[8192];
|
||||
char fname[PATH_MAX];
|
||||
char *fname;
|
||||
char *annotation, *name_only;
|
||||
FILE *ifp, *ofp;
|
||||
Search_List_Elem *sle = src_search_list.head;
|
||||
|
||||
/* Open input file. If open fails, walk along search-list until
|
||||
open succeeds or reaching end of list. */
|
||||
strcpy (fname, sf->name);
|
||||
fname = (char *) sf->name;
|
||||
|
||||
if (IS_ABSOLUTE_PATH (sf->name))
|
||||
sle = 0; /* Don't use search list for absolute paths. */
|
||||
@@ -116,6 +116,8 @@ annotate_source (Source_File *sf, unsigned int max_width,
|
||||
sf->name, fname));
|
||||
|
||||
ifp = fopen (fname, FOPEN_RB);
|
||||
if (fname != sf->name)
|
||||
free (fname);
|
||||
if (ifp)
|
||||
break;
|
||||
|
||||
@@ -141,6 +143,8 @@ annotate_source (Source_File *sf, unsigned int max_width,
|
||||
|
||||
if (sle)
|
||||
{
|
||||
fname = xmalloc (strlen (sle->path) + 3
|
||||
+ strlen (name_only ? name_only : sf->name));
|
||||
strcpy (fname, sle->path);
|
||||
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
|
||||
/* d:foo is not the same thing as d:/foo! */
|
||||
@@ -191,6 +195,7 @@ annotate_source (Source_File *sf, unsigned int max_width,
|
||||
else
|
||||
filename = sf->name;
|
||||
|
||||
fname = xmalloc (strlen (filename) + strlen (EXT_ANNO) + 1);
|
||||
strcpy (fname, filename);
|
||||
strcat (fname, EXT_ANNO);
|
||||
#ifdef __MSDOS__
|
||||
@@ -205,9 +210,9 @@ annotate_source (Source_File *sf, unsigned int max_width,
|
||||
{
|
||||
char *dot = strrchr (fname, '.');
|
||||
|
||||
if (dot)
|
||||
*dot = '\0';
|
||||
strcat (fname, ".ann");
|
||||
if (!dot)
|
||||
dot = fname + strlen (filename);
|
||||
strcpy (dot, ".ann");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -216,8 +221,10 @@ annotate_source (Source_File *sf, unsigned int max_width,
|
||||
if (!ofp)
|
||||
{
|
||||
perror (fname);
|
||||
free (fname);
|
||||
return 0;
|
||||
}
|
||||
free (fname);
|
||||
}
|
||||
|
||||
/* Print file names if output goes to stdout
|
||||
|
||||
@@ -43,9 +43,7 @@ int
|
||||
print_name_only (Sym *self)
|
||||
{
|
||||
const char *name = self->name;
|
||||
const char *filename;
|
||||
char *demangled = 0;
|
||||
char buf[PATH_MAX];
|
||||
int size = 0;
|
||||
|
||||
if (name)
|
||||
@@ -60,7 +58,9 @@ print_name_only (Sym *self)
|
||||
size = strlen (name);
|
||||
if ((line_granularity || inline_file_names) && self->file)
|
||||
{
|
||||
filename = self->file->name;
|
||||
const char *filename = self->file->name;
|
||||
char *buf;
|
||||
|
||||
if (!print_path)
|
||||
{
|
||||
filename = strrchr (filename, '/');
|
||||
@@ -73,6 +73,7 @@ print_name_only (Sym *self)
|
||||
filename = self->file->name;
|
||||
}
|
||||
}
|
||||
buf = xmalloc (strlen (filename) + 8 + 20 + 16);
|
||||
if (line_granularity)
|
||||
{
|
||||
sprintf (buf, " (%s:%d @ %lx)", filename, self->line_num,
|
||||
@@ -84,6 +85,7 @@ print_name_only (Sym *self)
|
||||
}
|
||||
printf ("%s", buf);
|
||||
size += strlen (buf);
|
||||
free (buf);
|
||||
}
|
||||
free (demangled);
|
||||
DBG (DFNDEBUG, printf ("{%d} ", self->cg.top_order));
|
||||
|
||||
Reference in New Issue
Block a user