about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--wcsmbs/mbsnrtowcs.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ffdb41935d..cc162d3ee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-19  Ulrich Drepper  <drepper@cygnus.com>
+
+	* wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Correctly initialize
+	outbufend for dst==NULL.
+
 1999-04-18  Ulrich Drepper  <drepper@cygnus.com>
 
 	* wcsmbs/mbsrtowcs.c (__mbsrtowcs): Correctly initialize outbufend
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 78e327eeea..cb2d41c4c8 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
+   Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -68,7 +68,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
       wchar_t buf[64];		/* Just an arbitrary size.  */
       const unsigned char *inbuf = *src;
 
-      data.outbufend = data.outbuf + sizeof (buf);
+      data.outbufend = (char *) buf + sizeof (buf);
       do
 	{
 	  data.outbuf = (char *) buf;