diff options
-rw-r--r-- | binutils/ChangeLog | 6 | ||||
-rw-r--r-- | binutils/nm.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 294e66c..5baf48e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,11 @@ 2017-02-13 Nick Clifton <nickc@redhat.com> + PR binutils/21150 + * nm.c (file_symbol): Add test of string length before testing + string characters. + +2017-02-13 Nick Clifton <nickc@redhat.com> + PR binutils/21135 * readelf.c (dump_section_as_bytes): Handle the case where uncompress_section_contents returns false. diff --git a/binutils/nm.c b/binutils/nm.c index fcbab41..7ddcc8a 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -685,7 +685,8 @@ size_forward1 (const void *P_x, const void *P_y) #define file_symbol(s, sn, snl) \ (((s)->flags & BSF_FILE) != 0 \ - || ((sn)[(snl) - 2] == '.' \ + || ((snl) > 2 \ + && (sn)[(snl) - 2] == '.' \ && ((sn)[(snl) - 1] == 'o' \ || (sn)[(snl) - 1] == 'a'))) |