aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-02-17 17:47:55 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-02-25 09:48:52 -0600
commit8021de10131868a8857e64b91cf0a868b76a61d8 (patch)
tree2675a5ce0b061f6a18a1668d880b82bc360881dc
parent25d943b95703ae45567395db4156b25052ee54c4 (diff)
qga: check utf8-to-utf16 conversion
UTF8 to UTF16 conversion can fail for genuine reasons, let's check errors. 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.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 043ed684a4..d76327f5a3 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1349,8 +1349,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);
@@ -1364,8 +1365,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,
@@ -1378,6 +1386,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);