mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 07:10:05 +00:00
Compute result correctly for successful call with s == NULL.
This commit is contained in:
parent
e20d563dac
commit
489926716c
@ -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.
|
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
|
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
|
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
|
if (status == GCONV_OK || status == GCONV_EMPTY_INPUT
|
||||||
|| status == GCONV_FULL_OUTPUT)
|
|| status == GCONV_FULL_OUTPUT)
|
||||||
result = data.outbuf - (unsigned char *) s;
|
result = data.outbuf - (unsigned char *) (s ?: buf);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
result = (size_t) -1;
|
result = (size_t) -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user