X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=event.cpp;fp=event.cpp;h=726c9f104140de3bfa76498911d48d0bc58a4107;hb=70453ecb690ff5d6008677ced1016d0235bee329;hp=bd43be3515011535a795000a0812684be853927f;hpb=9ee3804b6f85ded39df177e62ff7f51028686cde;p=nssm.git

diff --git a/event.cpp b/event.cpp
index bd43be3..726c9f1 100644
--- a/event.cpp
+++ b/event.cpp
@@ -1,11 +1,20 @@
 #include "nssm.h"
 
-static char error_message[65535];
+#define NSSM_ERROR_BUFSIZE 65535
+unsigned long tls_index;
 
 /* Convert error code to error string - must call LocalFree() on return value */
 char *error_string(unsigned long error) {
-  if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) &error_message, sizeof(error_message), 0)) {
-    if (_snprintf(error_message, sizeof(error_message), "system error %lu", error) < 0) return 0;
+  /* Thread-safe buffer */
+  char *error_message = (char *) TlsGetValue(tls_index);
+  if (! error_message) {
+    error_message = (char *) LocalAlloc(LPTR, NSSM_ERROR_BUFSIZE);
+    if (! error_message) return "<out of memory for error message>";
+    TlsSetValue(tls_index, (void *) error_message);
+  }
+
+  if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) error_message, NSSM_ERROR_BUFSIZE, 0)) {
+    if (_snprintf(error_message, NSSM_ERROR_BUFSIZE, "system error %lu", error) < 0) return 0;
   }
   return error_message;
 }