From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 19 Jan 2000 07:26:24 +0000 (+0000)
Subject: Compute result correctly for successful call with s == NULL.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=489926716ccef8d7b42894cfb6af498a3ee0edbc;p=thirdparty%2Fglibc.git

Compute result correctly for successful call with s == NULL.
---

diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index b546c7a9d39..c64c7eb4b3b 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000 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@cygnus.com>, 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
@@ -94,7 +94,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
 
   if (status == GCONV_OK || status == GCONV_EMPTY_INPUT
       || status == GCONV_FULL_OUTPUT)
-    result = data.outbuf - (unsigned char *) s;
+    result = data.outbuf - (unsigned char *) (s ?: buf);
   else
     {
       result = (size_t) -1;