diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-07-05 09:05:22 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-07-05 09:06:28 +0200 |
| commit | 19d494445981a09503e4a0175732745c39dd7c21 (patch) | |
| tree | 435b8d0a6ad02c03f537612497de68f27dacf223 /locale | |
| parent | 5dcbff5879a7d25e0dd511f4a71c039aa015e6a4 (diff) | |
| download | glibc-19d494445981a09503e4a0175732745c39dd7c21.tar.gz glibc-19d494445981a09503e4a0175732745c39dd7c21.tar.xz glibc-19d494445981a09503e4a0175732745c39dd7c21.zip | |
locale: Fix signed char bug in lr_getc
The array lr->buf contains characters, which can be signed. A 0xff byte in the input could be incorrectly reported as EOF. More importantly, get_string in linereader.c converts a signed input byte to a Unicode code point using ADDWC ((uint32_t) ch), under the assumption that this decodes the ISO-8859-1 input encoding. If char is signed, this does not give the correct result. This means that ISO-8859-1 input files for localedef are not actually supported, contrary to the comment in get_string. This is a happy accident because we can therefore change the file encoding to UTF-8 without impacting backwards compatibility. While at it, remove the \32 check for MS-DOS end-of-file character (^Z). Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/linereader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/programs/linereader.h b/locale/programs/linereader.h index 0fb10ec833..653a71d2d1 100644 --- a/locale/programs/linereader.h +++ b/locale/programs/linereader.h @@ -134,7 +134,7 @@ lr_getc (struct linereader *lr) return EOF; } - return lr->buf[lr->idx] == '\32' ? EOF : lr->buf[lr->idx++]; + return lr->buf[lr->idx++] & 0xff; } |