Avoid using the non-thread-safe strerror() function

https://bugzilla.redhat.com/show_bug.cgi?id=985481

1 files changed, 26 insertions, 0 deletions

diff --git a/common/message.c b/common/message.c
index 8b54ad1..e68dfac 100644
--- a/common/message.c
+++ b/common/message.c
@@ -86,6 +86,32 @@ p11_message_store (const char* msg,
 }
 
 void
+p11_message_err (int errnum,
+                 const char* msg,
+                 ...)
+{
+	char buffer[P11_MESSAGE_MAX];
+	char strerr[P11_MESSAGE_MAX];
+	va_list va;
+	size_t length;
+
+	va_start (va, msg);
+	length = vsnprintf (buffer, P11_MESSAGE_MAX - 1, msg, va);
+	va_end (va);
+
+	/* Was it truncated? */
+	if (length > P11_MESSAGE_MAX - 1)
+		length = P11_MESSAGE_MAX - 1;
+	buffer[length] = 0;
+
+	strncpy (strerr, "Unknown error", sizeof (strerr));
+	strerror_r (errnum, strerr, sizeof (strerr));
+	strerr[P11_MESSAGE_MAX - 1] = 0;
+
+	p11_message ("%s: %s", buffer, strerr);
+}
+
+void
 p11_message (const char* msg,
              ...)
 {