AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-31 06:51:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BZ #14716: memmem crash

Browse Source
This commit is contained in:
Maxim Kuvyrkov 2012-10-15 17:22:41 -07:00
parent b8d7c0968c
commit e9f3725206
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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>.

2
NEWS
View File

@ -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

4
string/str-two-way.h
View File

@ -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;