mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve error handling when formatting error messages on Windows

This commit is contained in:
Mike Gelfand 2015-10-11 16:15:19 +00:00
parent e745408f3b
commit 8beea92859
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libtransmission/utils.c
View File

@ -1121,18 +1121,21 @@ tr_win32_format_message (uint32_t code)
FORMAT_MESSAGE_FROM_SYSTEM |
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)
text = tr_win32_native_to_utf8 (wide_text, wide_size);
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;
}