system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BZ #5225]

Browse Source 
* stdio-common/vfscanf.c (_IO_vfwscanf): Don't misuse wp pointer
	to keep track of end of %[ format string element.
This commit is contained in:
Ulrich Drepper 2007-10-28 08:58:24 +00:00
parent 88197030d5
commit 4c6b2202cb
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2007-10-28 Ulrich Drepper <drepper@redhat.com> 2007-10-28 Ulrich Drepper <drepper@redhat.com>
[BZ #5225]
* stdio-common/vfscanf.c (_IO_vfwscanf): Don't misuse wp pointer
to keep track of end of %[ format string element.
[BZ #5222] [BZ #5222]
* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short * elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short
path elements in counting mode. path elements in counting mode.

5
localedata/ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-28 Ulrich Drepper <drepper@redhat.com>
[BZ #5224]
* locales/ig_NG: Add missing collating elements and symbols.
2007-10-14 Ulrich Drepper <drepper@redhat.com> 2007-10-14 Ulrich Drepper <drepper@redhat.com>
[BZ #4098] [BZ #4098]

5
localedata/locales/ig_NG
View File

@ -117,6 +117,11 @@ collating-element <O_2'> from "<U1ECC><U0301>"
collating-element <o_2'> from "<U1ECD><U0301>" collating-element <o_2'> from "<U1ECD><U0301>"
collating-element <O_2`> from "<U1ECC><U0300>" collating-element <O_2`> from "<U1ECC><U0300>"
collating-element <o_2`> from "<U1ECD><U0300>" collating-element <o_2`> from "<U1ECD><U0300>"
collating-symbol <s-h-ig>
collating-element <S-H> from "<U0053><U0048>"
collating-element <S-h> from "<U0053><U0068>"
collating-element <s-H> from "<U0073><U0048>"
collating-element <s-h> from "<U0073><U0068>"
collating-symbol <ubelowdot> collating-symbol <ubelowdot>
collating-element <U_> from "<U0055><U0323>" collating-element <U_> from "<U0055><U0323>"
collating-element <u_> from "<U0075><U0323>" collating-element <u_> from "<U0075><U0323>"

18
stdio-common/vfscanf.c
View File

@ -272,7 +272,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
{ \ { \
CHAR_T *old = wp; \ CHAR_T *old = wp; \
wpmax = (UCHAR_MAX + 1 > 2 * wpmax ? UCHAR_MAX + 1 : 2 * wpmax); \ wpmax = (UCHAR_MAX + 1 > 2 * wpmax ? UCHAR_MAX + 1 : 2 * wpmax); \
wp = (CHAR_T *) alloca (wpmax * sizeof (wchar_t)); \ wp = (CHAR_T *) alloca (wpmax * sizeof (CHAR_T)); \
if (old != NULL) \ if (old != NULL) \
MEMCPY (wp, old, wpsize); \ MEMCPY (wp, old, wpsize); \
} \ } \
@ -2314,7 +2314,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
if (__builtin_expect (fc == L'\0', 0)) if (__builtin_expect (fc == L'\0', 0))
conv_error (); conv_error ();
wp = (wchar_t *) f - 1; wchar_t *twend = (wchar_t *) f - 1;
#else #else
/* Fill WP with byte flags indexed by character. /* Fill WP with byte flags indexed by character.
We will use this flag map for matching input characters. */ We will use this flag map for matching input characters. */
@ -2365,9 +2365,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
/* Test whether it's in the scanlist. */ /* Test whether it's in the scanlist. */
runp = tw; runp = tw;
while (runp < wp) while (runp < twend)
{ {
if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp if (runp[0] == L'-' && runp[1] != '\0'
&& runp + 1 != twend
&& runp != tw && runp != tw
&& (unsigned int) runp[-1] <= (unsigned int) runp[1]) && (unsigned int) runp[-1] <= (unsigned int) runp[1])
{ {
@ -2405,7 +2406,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
} }
} }
if (runp == wp && !not_in) if (runp == twend && !not_in)
{ {
ungetc (c, s); ungetc (c, s);
goto out; goto out;
@ -2590,9 +2591,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
/* Test whether it's in the scanlist. */ /* Test whether it's in the scanlist. */
runp = tw; runp = tw;
while (runp < wp) while (runp < twend)
{ {
if (runp[0] == L'-' && runp[1] != '\0' && runp + 1 != wp if (runp[0] == L'-' && runp[1] != '\0'
&& runp + 1 != twend
&& runp != tw && runp != tw
&& (unsigned int) runp[-1] <= (unsigned int) runp[1]) && (unsigned int) runp[-1] <= (unsigned int) runp[1])
{ {
@ -2630,7 +2632,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
} }
} }
if (runp == wp && !not_in) if (runp == twend && !not_in)
{ {
ungetc (c, s); ungetc (c, s);
goto out2; goto out2;