diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/ChangeLog | 5 | ||||
| -rw-r--r-- | localedata/locales/ig_NG | 5 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 18 |
4 files changed, 24 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 2d9b1132e6..3f04e9d853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 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. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 784f71d1b4..457d52cfa3 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -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> [BZ #4098] diff --git a/localedata/locales/ig_NG b/localedata/locales/ig_NG index ed871ec563..308182bfad 100644 --- a/localedata/locales/ig_NG +++ b/localedata/locales/ig_NG @@ -117,6 +117,11 @@ collating-element <O_2'> from "<U1ECC><U0301>" 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>" diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index e4728d00c9..f550109a90 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -272,7 +272,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, { \ 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); \ } \ @@ -2314,7 +2314,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, 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. */ @@ -2365,9 +2365,10 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, /* 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]) { @@ -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); 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. */ 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]) { @@ -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); goto out2; |