luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 22:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: fix off-by-one length check

Browse Source 
Laszlo Ersek said: "The length check is off by one (in the safe direction); it
should be (nchars >= 2). The processing should be active for the wide string
L"\r\n" -- resulting in the empty wide string --, I believe."

Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>

https://bugzilla.gnome.org/show_bug.cgi?id=762202
This commit is contained in:
Marc-André Lureau 2016-02-17 17:50:52 +01:00
parent 0a580fc79e
commit a1bcd1e45a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/gwin32.c
View File

@ -203,7 +203,7 @@ g_win32_error_message (gint error)
{ {
nchars = wcslen (msg); nchars = wcslen (msg);
if (nchars > 2 && msg[nchars-1] == '\n' && msg[nchars-2] == '\r') if (nchars >= 2 && msg[nchars-1] == '\n' && msg[nchars-2] == '\r')
msg[nchars-2] = '\0'; msg[nchars-2] = '\0';
retval = g_utf16_to_utf8 (msg, -1, NULL, NULL, NULL); retval = g_utf16_to_utf8 (msg, -1, NULL, NULL, NULL);