| From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001 |
| From: Chen Qi <Qi.Chen@windriver.com> |
| Date: Tue, 10 Jul 2018 15:40:17 +0800 |
| Subject: [PATCH 10/22] 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 <Qi.Chen@windriver.com> |
| --- |
| src/libsystemd/sd-bus/bus-error.c | 11 ++++++++++- |
| src/libsystemd/sd-journal/journal-send.c | 5 +++++ |
| 2 files changed, 15 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c |
| index 77b2e1a0fd..fdba0e0142 100644 |
| --- a/src/libsystemd/sd-bus/bus-error.c |
| +++ b/src/libsystemd/sd-bus/bus-error.c |
| @@ -408,7 +408,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; |
| @@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static |
| |
| if (e && e->message) |
| return e->message; |
| - |
| +#ifndef __GLIBC__ |
| + strerror_r(abs(error), buf, ERRNO_BUF_LEN); |
| + return buf; |
| +#else |
| return strerror_r(abs(error), buf, ERRNO_BUF_LEN); |
| +#endif |
| } |
| |
| static bool map_ok(const sd_bus_error_map *map) { |
| diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c |
| index 69a2eb6404..1561859650 100644 |
| --- a/src/libsystemd/sd-journal/journal-send.c |
| +++ b/src/libsystemd/sd-journal/journal-send.c |
| @@ -361,7 +361,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]; |
| |
| -- |
| 2.34.1 |
| |