From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW5Gr-0002E0-GY for qemu-devel@nongnu.org; Wed, 17 Feb 2016 11:48:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW5Go-0003u0-75 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 11:48:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW5Go-0003tw-1k for qemu-devel@nongnu.org; Wed, 17 Feb 2016 11:48:06 -0500 From: marcandre.lureau@redhat.com Date: Wed, 17 Feb 2016 17:47:55 +0100 Message-Id: <1455727675-20625-6-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1455727675-20625-1-git-send-email-marcandre.lureau@redhat.com> References: <1455727675-20625-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 5/5] qga: check utf8-to-utf16 conversion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , lersek@redhat.com, mdroth@linux.vnet.ibm.com From: Marc-Andr=C3=A9 Lureau UTF8 to UTF16 conversion can fail for genuine reasons, let's check errors= . Reported-by: Laszlo Ersek Signed-off-by: Marc-Andr=C3=A9 Lureau --- qga/commands-win32.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ae8cf3d..09ed465 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1292,8 +1292,9 @@ void qmp_guest_set_user_password(const char *userna= me, NET_API_STATUS nas; char *rawpasswddata =3D NULL; size_t rawpasswdlen; - wchar_t *user, *wpass; + wchar_t *user =3D NULL, *wpass =3D NULL; USER_INFO_1003 pi1003 =3D { 0, }; + GError *gerr =3D NULL; =20 if (crypted) { error_setg(errp, QERR_UNSUPPORTED); @@ -1307,8 +1308,15 @@ void qmp_guest_set_user_password(const char *usern= ame, rawpasswddata =3D g_renew(char, rawpasswddata, rawpasswdlen + 1); rawpasswddata[rawpasswdlen] =3D '\0'; =20 - user =3D g_utf8_to_utf16(username, -1, NULL, NULL, NULL); - wpass =3D g_utf8_to_utf16(rawpasswddata, -1, NULL, NULL, NULL); + user =3D g_utf8_to_utf16(username, -1, NULL, NULL, &gerr); + if (!user) { + goto done; + } + + wpass =3D g_utf8_to_utf16(rawpasswddata, -1, NULL, NULL, &gerr); + if (!wpass) { + goto done; + } =20 pi1003.usri1003_password =3D wpass; nas =3D NetUserSetInfo(NULL, user, @@ -1321,6 +1329,11 @@ void qmp_guest_set_user_password(const char *usern= ame, g_free(msg); } =20 +done: + if (gerr) { + error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); + g_error_free(gerr); + } g_free(user); g_free(wpass); g_free(rawpasswddata); --=20 2.5.0