This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-476-ge9f3725
- From: mkuvyrkov at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Oct 2012 00:23:32 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-476-ge9f3725
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via e9f372520618161d7d73e028ca23818e83b88bbc (commit)
from b8d7c0968c095d25fded0e2dfea1a16b1fd42911 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e9f372520618161d7d73e028ca23818e83b88bbc
commit e9f372520618161d7d73e028ca23818e83b88bbc
Author: Maxim Kuvyrkov <maxim@codesourcery.com>
Date: Mon Oct 15 17:22:41 2012 -0700
Fix BZ #14716: memmem crash
diff --git a/ChangeLog b/ChangeLog
index 9343ce2..0c05941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-16 Maxim Kuvyrkov <maxim@codesourcery.com>
+
+ * NEWS: Mention BZ #14716.
+ * string/str-two-way.h (two_way_short_needle): Fix thinko introduced
+ when removing AVAILABLE1_USES_J macro.
+
2012-10-12 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86/bits/byteswap.h: Include <bits/types.h>.
diff --git a/NEWS b/NEWS
index 4d18638..9526702 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.17
14336, 14337, 14347, 14349, 14376, 14417, 14459, 14476, 14477, 14505,
14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545,
14557, 14562, 14568, 14576, 14579, 14583, 14587, 14602, 14621, 14638,
- 14645, 14648, 14652, 14660, 14661.
+ 14645, 14648, 14652, 14660, 14661, 14716.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/string/str-two-way.h b/string/str-two-way.h
index d2572da..d082fe0 100644
--- a/string/str-two-way.h
+++ b/string/str-two-way.h
@@ -309,13 +309,13 @@ two_way_short_needle (const unsigned char *haystack, size_t haystack_len,
!= (haystack_char = CANON_ELEMENT (*phaystack++)))
{
RET0_IF_0 (haystack_char);
-#if CHECK_EOL
+#if !CHECK_EOL
++j;
#endif
continue;
}
-#if !CHECK_EOL
+#if CHECK_EOL
/* Calculate J if it wasn't kept up-to-date in the first-character
loop. */
j = phaystack - &haystack[suffix] - 1;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
string/str-two-way.h | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources