OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* emultempl/pe.em (gld_$_open_dynamic_archive): Compute maximum length of 

format strings in the libname_fmt[] array, rather than relying upon a
  statically chosen value.  Adjust xmalloc call to use this longest length.
This commit is contained in:
Nick Clifton 2006-06-27 11:45:21 +00:00
parent ece2d90e7c
commit b1d9458ab4
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ld/ChangeLog
View File

@ -1,3 +1,11 @@
2006-06-27 Pedro Alves <pedro_alves@portugalmail.pt>
Nick Clifton <nickc@redhat.com>
* emultempl/pe.em (gld_$_open_dynamic_archive): Compute maximum
length of format strings in the libname_fmt[] array, rather than
relying upon a statically chosen value. Adjust xmalloc call to
use this longest length.
2006-06-27 Nick Clifton <nickc@redhat.com>
* ld.texinfo (-rpath-link): Clarify distinction between -rpath and

26
ld/emultempl/pe.em
View File

@ -1724,6 +1724,7 @@ gld_${EMULATION_NAME}_open_dynamic_archive
so, update the call to xmalloc() below. */
{ NULL, FALSE }
};
static unsigned int format_max_len = 0;
const char * filename;
char * full_string;
char * base_string;
@ -1735,19 +1736,30 @@ gld_${EMULATION_NAME}_open_dynamic_archive
filename = entry->filename;
if (format_max_len == 0)
/* We need to allow space in the memory that we are going to allocate
for the characters in the format string. Since the format array is
static we only need to calculate this information once. In theory
this value could also be computed statically, but this introduces
the possibility for a discrepancy and hence a possible memory
corruption. The lengths we compute here will be too long because
they will include any formating characters (%s) in the strings, but
this will not matter. */
for (i = 0; libname_fmt[i].format; i++)
if (format_max_len < strlen (libname_fmt[i].format))
format_max_len = strlen (libname_fmt[i].format);
full_string = xmalloc (strlen (search->name)
+ strlen (filename)
/* Allow space for the characters in the format
string. Also allow for the path separator that
is appended after the search name. We actually
allow 1 more byte than is strictly necessary,
but this will not hurt. */
+ sizeof libname_fmt[0].format
+ format_max_len
#ifdef DLL_SUPPORT
+ (pe_dll_search_prefix
? strlen (pe_dll_search_prefix) : 0)
#endif
+ 1);
/* Allow for the terminating NUL and for the path
separator character that is inserted between
search->name and the start of the format string. */
+ 2);
sprintf (full_string, "%s/", search->name);
base_string = full_string + strlen (full_string);