[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] qga: check utf8-to-utf16 conversion
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH 5/5] qga: check utf8-to-utf16 conversion |
Date: |
Wed, 17 Feb 2016 17:47:55 +0100 |
From: Marc-André Lureau <address@hidden>
UTF8 to UTF16 conversion can fail for genuine reasons, let's check errors.
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
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 *username,
NET_API_STATUS nas;
char *rawpasswddata = NULL;
size_t rawpasswdlen;
- wchar_t *user, *wpass;
+ wchar_t *user = NULL, *wpass = NULL;
USER_INFO_1003 pi1003 = { 0, };
+ GError *gerr = NULL;
if (crypted) {
error_setg(errp, QERR_UNSUPPORTED);
@@ -1307,8 +1308,15 @@ void qmp_guest_set_user_password(const char *username,
rawpasswddata = g_renew(char, rawpasswddata, rawpasswdlen + 1);
rawpasswddata[rawpasswdlen] = '\0';
- user = g_utf8_to_utf16(username, -1, NULL, NULL, NULL);
- wpass = g_utf8_to_utf16(rawpasswddata, -1, NULL, NULL, NULL);
+ user = g_utf8_to_utf16(username, -1, NULL, NULL, &gerr);
+ if (!user) {
+ goto done;
+ }
+
+ wpass = g_utf8_to_utf16(rawpasswddata, -1, NULL, NULL, &gerr);
+ if (!wpass) {
+ goto done;
+ }
pi1003.usri1003_password = wpass;
nas = NetUserSetInfo(NULL, user,
@@ -1321,6 +1329,11 @@ void qmp_guest_set_user_password(const char *username,
g_free(msg);
}
+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);
--
2.5.0
- [Qemu-devel] [PATCH 0/5] qga: win32 guest-set-user-password improvements, marcandre . lureau, 2016/02/17
- [Qemu-devel] [PATCH 1/5] qga: use more idiomatic qemu-style eol operators, marcandre . lureau, 2016/02/17
- [Qemu-devel] [PATCH 2/5] qga: use size_t for wcslen() return value, marcandre . lureau, 2016/02/17
- [Qemu-devel] [PATCH 4/5] qga: fix off-by-one length check, marcandre . lureau, 2016/02/17
- [Qemu-devel] [PATCH 3/5] qga: use wide-chars constants for wchar_t comparisons, marcandre . lureau, 2016/02/17
- [Qemu-devel] [PATCH 5/5] qga: check utf8-to-utf16 conversion,
marcandre . lureau <=
- Re: [Qemu-devel] [PATCH 0/5] qga: win32 guest-set-user-password improvements, Laszlo Ersek, 2016/02/17
- Re: [Qemu-devel] [PATCH 0/5] qga: win32 guest-set-user-password improvements, Michael Roth, 2016/02/24