[binutils-gdb] Replace uses of strncmp with memcmp
Alan Modra
amodra@sourceware.org
Mon May 7 03:04:00 GMT 2018
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7bd8862c3ad0ee291d27837ae3cd30288a00b922
commit 7bd8862c3ad0ee291d27837ae3cd30288a00b922
Author: Alan Modra <amodra@gmail.com>
Date: Mon May 7 11:36:07 2018 +0930
Replace uses of strncmp with memcmp
Avoids gcc pr85623 for these calls.
* cofflink.c (_bfd_coff_link_input_bfd): Use memcmp rather than
strncmp when checking for ".bf" special symbol.
* prXXigen.c (_bfd_XXi_swap_scnhdr_out): Make pe_required_section_flags
section name a char array, remove sentinal known_sections entry,
and adjust loop over known_sections to suit. Use memcmp rather
than strncmp.
Diff:
---
bfd/ChangeLog | 10 ++++++++++
bfd/cofflink.c | 2 +-
bfd/peXXigen.c | 14 +++++++-------
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0178998..d26c69a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2018-05-07 Alan Modra <amodra@gmail.com>
+
+ * cofflink.c (_bfd_coff_link_input_bfd): Use memcmp rather than
+ strncmp when checking for ".bf" special symbol.
+ * peXXigen.c (_bfd_XXi_swap_scnhdr_out): Make pe_required_section_flags
+ section name a char array, remove sentinal known_sections entry,
+ and adjust loop over known_sections to suit. Use memcmp rather
+ than strncmp.
+
2018-05-04 Alan Modra <amodra@gmail.com>
* elf-linux-core.h (struct elf_external_linux_prpsinfo32_ugid32),
@@ -18,6 +27,7 @@
pragmas.
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Use strnlen to avoid
false positive gcc-8 warning.
+ * cofflink.c (_bfd_coff_link_input_bfd): Likewise.
2018-05-04 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
index 6ca547c..2f73f72 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
@@ -1839,7 +1839,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd)
case C_FCN:
if (obj_pe (input_bfd)
- && strncmp (isym.n_name, ".bf", sizeof isym.n_name) != 0
+ && memcmp (isym.n_name, ".bf", sizeof ".bf") != 0
&& isym.n_scnum > 0)
{
/* For PE, .lf and .ef get their value left alone,
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index a62d126..5e0acc4 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -1018,7 +1018,7 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
typedef struct
{
- const char * section_name;
+ char section_name[SCNNMLEN];
unsigned long must_have;
}
pe_required_section_flags;
@@ -1037,7 +1037,6 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
{ ".text" , IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE },
{ ".tls", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_WRITE },
{ ".xdata", IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_INITIALIZED_DATA },
- { NULL, 0}
};
pe_required_section_flags * p;
@@ -1050,11 +1049,12 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
by ld --enable-auto-import (if auto-import is actually needed),
by ld --omagic, or by obcopy --writable-text. */
- for (p = known_sections; p->section_name; p++)
- if (strncmp (scnhdr_int->s_name, p->section_name,
- sizeof scnhdr_int->s_name) == 0)
+ for (p = known_sections;
+ p < known_sections + ARRAY_SIZE (known_sections);
+ p++)
+ if (memcmp (scnhdr_int->s_name, p->section_name, SCNNMLEN) == 0)
{
- if (strncmp (scnhdr_int->s_name, ".text", sizeof scnhdr_int->s_name)
+ if (memcmp (scnhdr_int->s_name, ".text", sizeof ".text")
|| (bfd_get_file_flags (abfd) & WP_TEXT))
scnhdr_int->s_flags &= ~IMAGE_SCN_MEM_WRITE;
scnhdr_int->s_flags |= p->must_have;
@@ -1067,7 +1067,7 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
if (coff_data (abfd)->link_info
&& ! bfd_link_relocatable (coff_data (abfd)->link_info)
&& ! bfd_link_pic (coff_data (abfd)->link_info)
- && strncmp (scnhdr_int->s_name, ".text", sizeof scnhdr_int->s_name) == 0)
+ && memcmp (scnhdr_int->s_name, ".text", sizeof ".text") == 0)
{
/* By inference from looking at MS output, the 32 bit field
which is the combination of the number_of_relocs and
More information about the Binutils-cvs
mailing list