log: save errno on strerror_r()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 43199bea533b555babb33175e02db1c8f954840c..1050dc604c089c3bb991740def2fb800e6ecfabc 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -344,7 +344,9 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
                        char errno_buf[MAXPATHLEN / 2] = {"Failed to get errno string"}; \
                        char *ptr = NULL;                                                \
                        {                                                                \
+                               int saved_errno = errno;                                 \
                                ptr = strerror_r(errno, errno_buf, sizeof(errno_buf));   \
+                               errno = saved_errno;                                     \
                                if (!ptr)                                                \
                                        ptr = errno_buf;                                 \
                        }
@@ -353,7 +355,9 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
                        char errno_buf[MAXPATHLEN / 2] = {"Failed to get errno string"}; \
                        char *ptr = errno_buf;                                           \
                        {                                                                \
+                               int saved_errno = errno;                                 \
                                (void)strerror_r(errno, errno_buf, sizeof(errno_buf));   \
+                               errno = saved_errno;                                     \
                        }
        #endif
 #elif ENFORCE_THREAD_SAFETY