Merge branch '3.1' into 3.2

mariadb-corporation · Jul 19, 2021 · dcfb97e · dcfb97e
2 parents f999686 + e9f02c9
commit dcfb97e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/libmariadb/win32_errmsg.c b/libmariadb/win32_errmsg.c
@@ -117,7 +117,7 @@ void ma_format_win32_error(char* buf, size_t buflen, DWORD code, _Printf_format_
     return;
   if (entry)
   {
-    sprintf_s(cur, end - cur, "%s. Error 0x%08lX(%s)", entry->msg, code, entry->sym);
+    snprintf(cur, end - cur, "%s. Error 0x%08lX(%s)", entry->msg, code, entry->sym);
   }
   else
   {
@@ -131,7 +131,8 @@ void ma_format_win32_error(char* buf, size_t buflen, DWORD code, _Printf_format_
       cur++;
       *cur = 0;
     }
-    sprintf_s(cur, end - cur, ". Error %lu/0x%08lX", code, code);
+    snprintf(cur, end - cur, ". Error %lu/0x%08lX", code, code);
   }
+  end[-1] = 0;
 }