remove another invalid skip of locking in ungetwc

[musl] / src / stdio / ungetwc.c

diff --git a/src/stdio/ungetwc.c b/src/stdio/ungetwc.c
index 8cc85a6..394f92a 100644 (file)
--- a/src/stdio/ungetwc.c
+++ b/src/stdio/ungetwc.c
@@ -9,19 +9,15 @@ wint_t ungetwc(wint_t c, FILE *f)
        unsigned char mbc[MB_LEN_MAX];
        int l=1;
 
-       if (c == WEOF) return c;
-
-       /* Try conversion early so we can fail without locking if invalid */
-       if (!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)
-               return WEOF;
-
        FLOCK(f);
 
        f->mode |= f->mode+1;
 
-       if ((!f->rend && __toread(f)) || f->rpos < f->buf - UNGET + l) {
+       if (!f->rpos) __toread(f);
+       if (!f->rpos || f->rpos < f->buf - UNGET + l || c == WEOF ||
+           (!isascii(c) && (l = wctomb((void *)mbc, c)) < 0)) {
                FUNLOCK(f);
-               return EOF;
+               return WEOF;
        }
 
        if (isascii(c)) *--f->rpos = c;