aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-02-17 17:47:54 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-02-25 09:48:51 -0600
commit25d943b95703ae45567395db4156b25052ee54c4 (patch)
tree9377545cb6158a9393ef7d5583039a893271b2ae
parent6c6916dac8a146f2e8ee845a2a4e8d459a8689eb (diff)
qga: fix off-by-one length check
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@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--qga/commands-win32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 2df1e2d61b..043ed684a4 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1323,7 +1323,7 @@ get_net_error_message(gint error)
if (msg != NULL) {
nchars = wcslen(msg);
- if (nchars > 2 &&
+ if (nchars >= 2 &&
msg[nchars - 1] == L'\n' &&
msg[nchars - 2] == L'\r') {
msg[nchars - 2] = L'\0';