From dd53dc9b9542cbd2c39a39096941dfed70d06506 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 Subject: [PATCH 20/20] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. int strerror_r(int errnum, char *buf, size_t buflen); /* XSI-compliant */ char *strerror_r(int errnum, char *buf, size_t buflen); /* GNU-specific */ We need to distinguish between them. Otherwise, we'll get an int value assigned to (char *) variable, resulting in segment fault. Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi --- src/journal/journal-send.c | 5 +++++ src/libsystemd/sd-bus/bus-error.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index 65bcbcd2e..aef80dd8f 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove char* j; errno = 0; +#ifndef __GLIBC__ + strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); + j = buffer + 8 + k; +#else j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); +#endif if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index ec359ac13..d2aa86cea 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -362,7 +362,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0; +#ifndef __GLIBC__ + strerror_r(error, m, k); + x = m; +#else x = strerror_r(error, m, k); +#endif if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; -- 2.11.0