Quoting marcandre.lur...@redhat.com (2016-02-17 10:47:53)
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> Reported-by: Laszlo Ersek <ler...@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Reviewed-by: Michael Roth <mdr...@linux.vnet.ibm.com>
> ---
> qga/commands-win32.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index e5afc5d..b20f107 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -1266,8 +1266,10 @@ get_net_error_message(gint error)
> if (msg != NULL) {
> nchars = wcslen(msg);
>
> - if (nchars > 2 && msg[nchars-1] == '\n' && msg[nchars-2] == '\r') {
> - msg[nchars-2] = '\0';
> + if (nchars > 2 &&
> + msg[nchars - 1] == L'\n' &&
> + msg[nchars - 2] == L'\r') {
> + msg[nchars - 2] = L'\0';
> }
>
> retval = g_utf16_to_utf8(msg, -1, NULL, NULL, NULL);
> --
> 2.5.0
>
