diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-06-27 11:45:21 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-06-27 11:45:21 +0000 |
| commit | b1d9458ab40c15e0fd1ca39046e7bb041135856a (patch) | |
| tree | faba0f25990d4eb7b968302d2b6d97281a5c78c8 /ld | |
| parent | ece2d90e7ca6bed46bc5d2ee1ee770e14ce7fd74 (diff) | |
| download | gdb-b1d9458ab40c15e0fd1ca39046e7bb041135856a.zip gdb-b1d9458ab40c15e0fd1ca39046e7bb041135856a.tar.gz gdb-b1d9458ab40c15e0fd1ca39046e7bb041135856a.tar.bz2 | |
* 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.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/emultempl/pe.em | 26 |
2 files changed, 27 insertions, 7 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index bc5d6b2..059284c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -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 diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index b297069..90e9478 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -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); |