Changeset 14573

Timestamp:

Oct 11, 2015, 4:15:19 PM (6 years ago)

Author:

mikedld

Message:

Improve error handling when formatting error messages on Windows

File:

• trunk/libtransmission/utils.c (modified) (2 diffs)

trunk/libtransmission/utils.c

@@ -1122 +1122 @@
                               FORMAT_MESSAGE_IGNORE_INSERTS,
                               NULL, code, 0, (LPWSTR)&wide_text, 0, NULL);
+  if (wide_size == 0)
+    return tr_strdup_printf ("Unknown error (0x%08x)", code);
 
   if (wide_size != 0 && wide_text != NULL)
@@ -1128 +1130 @@
   LocalFree (wide_text);
 
-  /* Most (all?) messages contain "\r\n" in the end, chop it */
-  text_size = strlen (text);
-  while (text_size > 0 &&
-         text[text_size - 1] >= '\0' &&
-         text[text_size - 1] <= ' ')
-    text[--text_size] = '\0';
+  if (text != NULL)
+    {
+      /* Most (all?) messages contain "\r\n" in the end, chop it */
+      text_size = strlen (text);
+      while (text_size > 0 && isspace ((uint8_t) text[text_size - 1]))
+        text[--text_size] = '\0';
+    }
 
   return text;