log: save errno on strerror_r()

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

log: save errno on strerror_r()
a285b308 · Christian Brauner · b7051eb7 · a285b308
Unverified Commit a285b308 authored Sep 03, 2018 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

log.h src/lxc/log.h +4 -0

No files found.
--- 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