From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 33044388DD2C; Sat, 27 Aug 2022 13:48:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33044388DD2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661608101; bh=FD4Tx6W6+7+YYcAhp6ZUKeqNLjFC8HUVVxUAEtOmUnE=; h=From:To:Subject:Date:From; b=mRQ4wxhnsa1I65svJU6A85tKD1CDLQNXf4H7h6u1zMMddOo2cKZZWP4m/MXPFtK1c hj+zbnNfmK7XfQm4Pa+o4mlcAAupq0/+khlQt7YyEzNNH1LEHoyVjleiLb9D8ihLa2 X5VMTXzEoPao+O099dXb3jC9YXxMpbKToD6hCfd0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] mach: Make xpg_strerror_r set a message on error X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 03ad444e8e086391f53d87c3949e0d44adef4bc3 X-Git-Newrev: cb033e6b0ca7b8873cd00687ffd1828038a595d3 Message-Id: <20220827134821.33044388DD2C@sourceware.org> Date: Sat, 27 Aug 2022 13:48:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cb033e6b0ca7b8873cd00687ffd1828038a595d3 commit cb033e6b0ca7b8873cd00687ffd1828038a595d3 Author: Samuel Thibault Date: Sat Aug 27 14:46:23 2022 +0200 mach: Make xpg_strerror_r set a message on error posix advises to have strerror_r fill a message even when we are returning an error. This makes mach's xpg_strerror_r do this, like the generic version does. Spotted by the libunistring testsuite test-strerror_r Diff: --- sysdeps/mach/xpg-strerror.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sysdeps/mach/xpg-strerror.c b/sysdeps/mach/xpg-strerror.c index 92bb67e2bc..de75cc84ae 100644 --- a/sysdeps/mach/xpg-strerror.c +++ b/sysdeps/mach/xpg-strerror.c @@ -51,7 +51,11 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen) code = err_get_code (errnum); if (system > err_max_system || ! __mach_error_systems[system].bad_sub) - return EINVAL; + { + __snprintf (buf, buflen, "%s%X", _("Error in unknown error system: "), + errnum); + return EINVAL; + } es = &__mach_error_systems[system]; @@ -62,11 +66,11 @@ __xpg_strerror_r (int errnum, char *buf, size_t buflen) else estr = (const char *) _(es->subsystem[sub].codes[code]); - size_t estrlen = strlen (estr) + 1; + size_t estrlen = strlen (estr); - if (buflen < estrlen) - return ERANGE; + /* Terminate the string in any case. */ + if (buflen > 0) + *((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0'; - memcpy (buf, estr, estrlen); - return 0; + return buflen <= estrlen ? ERANGE : 0; }