summaryrefslogtreecommitdiff
path: root/src/multibyte/mbsnrtowcs.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-05-02 13:59:48 -0400
committerRich Felker <dalias@aerifal.cx>2012-05-02 13:59:48 -0400
commit485fb14ab414ef7fde4469a51b116281758a4aa0 (patch)
tree82f78ead71e706e6f1b2f8f69976b6f5b9b3106b /src/multibyte/mbsnrtowcs.c
parent6f0cf3061b2f68f8a43e3417cc61965ffaa2fe95 (diff)
downloadmusl-485fb14ab414ef7fde4469a51b116281758a4aa0.tar.gz
fix longstanding exit logic bugs in mbsnrtowcs and wcsnrtombs
these are POSIX 2008 (previously GNU extension) functions that are rarely used. apparently they had never been tested before, since the end-of-string logic was completely missing. mbsnrtowcs is used by modern versions of bash for its glob implementation, and and this bug was causing tab completion to hang in an infinite loop.
Diffstat (limited to 'src/multibyte/mbsnrtowcs.c')
-rw-r--r--src/multibyte/mbsnrtowcs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/multibyte/mbsnrtowcs.c b/src/multibyte/mbsnrtowcs.c
index c6f0207f..f42e30d9 100644
--- a/src/multibyte/mbsnrtowcs.c
+++ b/src/multibyte/mbsnrtowcs.c
@@ -47,6 +47,10 @@ size_t mbsnrtowcs(wchar_t *wcs, const char **src, size_t n, size_t wn, mbstate_t
cnt = l;
break;
}
+ if (!l) {
+ s = 0;
+ break;
+ }
/* have to roll back partial character */
*(unsigned *)st = 0;
break;