This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[Committed] Fix a thinko with memmem return values
- From: Eric Christopher <echristo at gmail dot com>
- To: "binutils at sourceware dot org" <binutils at sourceware dot org>
- Cc: Cary Coutant <ccoutant at gmail dot com>
- Date: Wed, 08 Nov 2017 22:22:06 +0000
- Subject: [Committed] Fix a thinko with memmem return values
- Authentication-results: sourceware.org; auth=none
Hi all,
I've just committed this as a quick fix for a problem with gdb index and
return values from memmem.
Thanks!
-eric
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 2d0ae45dc8..737e3af18a 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-08 Kyle Butt <iteratee@google.com>
+
+ * object.cc (do_find_special_sections): Fix a thinko with memmem
return
+ values and check for != NULL rather than == 0.
+
2017-11-07 Alan Modra <amodra@gmail.com>
* system.h (textdomain, bindtextdomain): Use safer "do nothing".
diff --git a/gold/object.cc b/gold/object.cc
index 4110686ff3..013565103c 100644
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -816,9 +816,9 @@ Sized_relobj_file<size,
big_endian>::do_find_special_sections(
return (this->has_eh_frame_
|| (!parameters->options().relocatable()
&& parameters->options().gdb_index()
- && (memmem(names, sd->section_names_size, "debug_info", 11)
== 0
+ && (memmem(names, sd->section_names_size, "debug_info", 11)
!= NULL
|| memmem(names, sd->section_names_size,
- "debug_types", 12) == 0)));
+ "debug_types", 12) != NULL)));
}
// Read the sections and symbols from an object file.