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]
* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short
path elements in counting mode.
collating-element <o_2'> from "<U1ECD><U0301>"
collating-element <O_2`> from "<U1ECC><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-element <U_> from "<U0055><U0323>"
collating-element <u_> from "<U0075><U0323>"
{ \
CHAR_T *old = wp; \
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) \
MEMCPY (wp, old, wpsize); \
} \
if (__builtin_expect (fc == L'\0', 0))
conv_error ();
- wp = (wchar_t *) f - 1;
+ wchar_t *twend = (wchar_t *) f - 1;
#else
/* Fill WP with byte flags indexed by character.
We will use this flag map for matching input characters. */
/* Test whether it's in the scanlist. */
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
&& (unsigned int) runp[-1] <= (unsigned int) runp[1])
{
}
}
- if (runp == wp && !not_in)
+ if (runp == twend && !not_in)
{
ungetc (c, s);
goto out;
/* Test whether it's in the scanlist. */
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
&& (unsigned int) runp[-1] <= (unsigned int) runp[1])
{
}
}
- if (runp == wp && !not_in)
+ if (runp == twend && !not_in)
{
ungetc (c, s);
goto out2;