aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-21 06:58:22 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-21 06:58:22 +0000
commit376b8b3de93bcb3bb4a739d62bc02895f6eba227 (patch)
tree09ac3b19b282c0c0e85aba1eb0ea60de840a6ae4
parent4a069c3345ea4e832c814a46267942226e53f9a2 (diff)
downloadglibc-376b8b3de93bcb3bb4a739d62bc02895f6eba227.zip
glibc-376b8b3de93bcb3bb4a739d62bc02895f6eba227.tar.gz
glibc-376b8b3de93bcb3bb4a739d62bc02895f6eba227.tar.bz2
Update.
* wcsmbs/wcsrtombs.c (__wcsrtombs): If output buffer is too small don't search for NUL byte to decrement counter. Reported by Ulrich.Brink@sap.com.
-rw-r--r--ChangeLog4
-rw-r--r--wcsmbs/wcsrtombs.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 268c7ea..a62bc29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2000-04-20 Ulrich Drepper <drepper@redhat.com>
+ * wcsmbs/wcsrtombs.c (__wcsrtombs): If output buffer is too small
+ don't search for NUL byte to decrement counter.
+ Reported by Ulrich.Brink@sap.com.
+
* iconv/gconv_simple.c: Define separate functions to convert from
UCS4/UCS4-LE to the internal encoding.
* iconv/gconv_builtin.h: Use separate functions to convert from
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index cbb39d3..28af214 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -114,8 +114,7 @@ __wcsrtombs (dst, src, len, ps)
/* We have to determine whether the last character converted
is the NUL character. */
- if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
- || status == __GCONV_FULL_OUTPUT)
+ if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
&& data.__outbuf[-1] == '\0')
{
assert (data.__outbuf != (unsigned char *) dst);