diff options
author | Jens Gustedt <Jens.Gustedt@inria.fr> | 2014-11-09 11:18:08 +0100 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2014-11-15 15:08:03 -0500 |
commit | 941644e98c3d05761b4639a8ae5afacd8586d1b9 (patch) | |
tree | 07b5a816a539376dde70db9ffcfb739bb59bfcf3 /src/multibyte/mbrtoc16.c | |
parent | b91cdbe2bc8b626aa04dc6e3e84345accf34e4b1 (diff) | |
download | musl-941644e98c3d05761b4639a8ae5afacd8586d1b9.tar.gz musl-941644e98c3d05761b4639a8ae5afacd8586d1b9.tar.xz musl-941644e98c3d05761b4639a8ae5afacd8586d1b9.zip |
implement a private state for the uchar.h functions
The C standard is imperative on that: 7.28.1 ... If ps is a null pointer, each function uses its own internal mbstate_t object instead, which is initialized at program startup to the initial conversion state; and these functions are also not supposed to implicitly use the state of the wchar.h functions: 7.29.6.3 ... The implementation behaves as if no library function calls these functions with a null pointer for ps. Previously this resulted in two bugs. - The functions c16rtomb and mbrtoc16 would crash when called with ps set to null. - The function mbrtoc32 used the private state of mbrtowc, which it is not allowed to do.
Diffstat (limited to 'src/multibyte/mbrtoc16.c')
-rw-r--r-- | src/multibyte/mbrtoc16.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/multibyte/mbrtoc16.c b/src/multibyte/mbrtoc16.c index 74b7d77e..765ff903 100644 --- a/src/multibyte/mbrtoc16.c +++ b/src/multibyte/mbrtoc16.c @@ -3,6 +3,8 @@ size_t mbrtoc16(char16_t *restrict pc16, const char *restrict s, size_t n, mbstate_t *restrict ps) { + static unsigned internal_state; + if (!ps) ps = (void *)&internal_state; unsigned *pending = (unsigned *)ps; if (!s) return mbrtoc16(0, "", 1, ps); |