| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Tue, 10 Jul 2018 15:40:17 +0800 |
| 4 | Subject: [PATCH 18/24] distinguish XSI-compliant strerror_r from GNU-specifi |
| 5 | strerror_r |
| 6 | |
| 7 | XSI-compliant strerror_r and GNU-specifi strerror_r are different. |
| 8 | |
| 9 | int strerror_r(int errnum, char *buf, size_t buflen); |
| 10 | /* XSI-compliant */ |
| 11 | |
| 12 | char *strerror_r(int errnum, char *buf, size_t buflen); |
| 13 | /* GNU-specific */ |
| 14 | |
| 15 | We need to distinguish between them. Otherwise, we'll get an int value |
| 16 | assigned to (char *) variable, resulting in segment fault. |
| 17 | |
| 18 | Upstream-Status: Inappropriate [musl specific] |
| 19 | |
| 20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 21 | --- |
| 22 | src/journal/journal-send.c | 5 +++++ |
| 23 | src/libsystemd/sd-bus/bus-error.c | 5 +++++ |
| 24 | 2 files changed, 10 insertions(+) |
| 25 | |
| 26 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c |
| 27 | index 3fea912..4f1e592 100644 |
| 28 | --- a/src/journal/journal-send.c |
| 29 | +++ b/src/journal/journal-send.c |
| 30 | @@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove |
| 31 | char* j; |
| 32 | |
| 33 | errno = 0; |
| 34 | +#ifndef __GLIBC__ |
| 35 | + strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); |
| 36 | + j = buffer + 8 + k; |
| 37 | +#else |
| 38 | j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); |
| 39 | +#endif |
| 40 | if (errno == 0) { |
| 41 | char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; |
| 42 | |
| 43 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c |
| 44 | index dc95237..bdda30f 100644 |
| 45 | --- a/src/libsystemd/sd-bus/bus-error.c |
| 46 | +++ b/src/libsystemd/sd-bus/bus-error.c |
| 47 | @@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { |
| 48 | return; |
| 49 | |
| 50 | errno = 0; |
| 51 | +#ifndef __GLIBC__ |
| 52 | + strerror_r(error, m, k); |
| 53 | + x = m; |
| 54 | +#else |
| 55 | x = strerror_r(error, m, k); |
| 56 | +#endif |
| 57 | if (errno == ERANGE || strlen(x) >= k - 1) { |
| 58 | free(m); |
| 59 | k *= 2; |
| 60 | -- |
| 61 | 2.7.4 |
| 62 | |