From 489926716ccef8d7b42894cfb6af498a3ee0edbc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 19 Jan 2000 07:26:24 +0000 Subject: [PATCH] Compute result correctly for successful call with s == NULL. --- wcsmbs/wcrtomb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index b546c7a9d3..c64c7eb4b3 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 , 1996. + Contributed by Ulrich Drepper , 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;