aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2016-04-26 15:26:40 -0400
committerRich Felker <dalias@aerifal.cx>2016-04-26 15:26:40 -0400
commit6ed791e768d83b40ed56c99dbb1ed72c1e49aae7 (patch)
treea31203a6ee0fe3131e4366867e5c7f48cbf58b45
parentbe999f7a54e81656ea0409030205177327a7450c (diff)
downloadmusl-6ed791e768d83b40ed56c99dbb1ed72c1e49aae7.tar.gz
musl-6ed791e768d83b40ed56c99dbb1ed72c1e49aae7.tar.xz
musl-6ed791e768d83b40ed56c99dbb1ed72c1e49aae7.zip
fix FILE buffer underflow in ungetwc
commit 7e816a6487932cbb3cb71d94b609e50e81f4e5bf (version 1.1.11 release cycle) moved the code that performs wchar_t to multibyte conversion across code that used the resulting length in bytes, thereby breaking the unget buffer space check in ungetwc and clobbering up to three bytes below the start of the buffer. for allocated FILEs (all read-enabled FILEs except stdin), the underflow clobbers at most the FILE-specific locale pointer. no stores are performed through this pointer, but subsequent loads may result in a crash or mismatching encoding rule (UTF-8 multibyte vs byte-based). for stdin, the buffer lies in .bss and the underflow may clobber another object. in practice, for libc.so the adjacent object seems to be stderr's buffer, which is completely unused, but this could vary with linking options, or when static linking. applications which do not attempt to use more than one character of ungetwc pushback, or which do not use ungetwc, are not affected.
-rw-r--r--src/stdio/ungetwc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/stdio/ungetwc.c b/src/stdio/ungetwc.c
index 80d6e203..9edf366f 100644
--- a/src/stdio/ungetwc.c
+++ b/src/stdio/ungetwc.c
@@ -8,7 +8,7 @@
wint_t ungetwc(wint_t c, FILE *f)
{
unsigned char mbc[MB_LEN_MAX];
- int l=1;
+ int l;
locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
FLOCK(f);
@@ -17,8 +17,8 @@ wint_t ungetwc(wint_t c, FILE *f)
*ploc = f->locale;
if (!f->rpos) __toread(f);
- if (!f->rpos || f->rpos < f->buf - UNGET + l || c == WEOF ||
- (!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)) {
+ if (!f->rpos || c == WEOF || (l = wcrtomb((void *)mbc, c, 0)) < 0 ||
+ f->rpos < f->buf - UNGET + l) {
FUNLOCK(f);
*ploc = loc;
return WEOF;