From fcec1a92c76c91ad7ca0221606e38154ee5e7637 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 18 Jan 2012 10:38:29 +0100 Subject: [PATCH 35/52] ui/vnc: Convert sasl.mechlist to g_malloc() & friends RH-Author: Markus Armbruster Message-id: <1326883126-22053-36-git-send-email-armbru@redhat.com> Patchwork-id: 36596 O-Subject: [RHEL-6.3 PATCH qemu-kvm 35/52] ui/vnc: Convert sasl.mechlist to g_malloc() & friends Bugzilla: 758194 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Laszlo Ersek RH-Acked-by: Amit Shah Fixes protocol_client_auth_sasl_mechname() not to crash when malloc() fails. Spotted by Coverity. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi (cherry picked from commit 302d9d6fd8cb34e393cc9bb101a1748bd53899d3) Conflicts: vnc-auth-sasl.c Conflicts because we don't have commit ae878b17. --- vnc-auth-sasl.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) Signed-off-by: Michal Novotny --- vnc-auth-sasl.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/vnc-auth-sasl.c b/vnc-auth-sasl.c index 6ceb3e9..47e2deb 100644 --- a/vnc-auth-sasl.c +++ b/vnc-auth-sasl.c @@ -35,7 +35,7 @@ void vnc_sasl_client_cleanup(VncState *vs) vs->sasl.encodedLength = vs->sasl.encodedOffset = 0; vs->sasl.encoded = NULL; free(vs->sasl.username); - free(vs->sasl.mechlist); + g_free(vs->sasl.mechlist); vs->sasl.username = vs->sasl.mechlist = NULL; sasl_dispose(&vs->sasl.conn); vs->sasl.conn = NULL; @@ -429,11 +429,7 @@ static int protocol_client_auth_sasl_start_len(VncState *vs, uint8_t *data, size static int protocol_client_auth_sasl_mechname(VncState *vs, uint8_t *data, size_t len) { - char *mechname = malloc(len + 1); - if (!mechname) { - VNC_DEBUG("Out of memory reading mechname\n"); - vnc_client_error(vs); - } + char *mechname = g_malloc(len + 1); strncpy(mechname, (char*)data, len); mechname[len] = '\0'; VNC_DEBUG("Got client mechname '%s' check against '%s'\n", @@ -459,7 +455,7 @@ static int protocol_client_auth_sasl_mechname(VncState *vs, uint8_t *data, size_ } } - free(vs->sasl.mechlist); + g_free(vs->sasl.mechlist); vs->sasl.mechlist = mechname; VNC_DEBUG("Validated mechname '%s'\n", mechname); @@ -468,7 +464,7 @@ static int protocol_client_auth_sasl_mechname(VncState *vs, uint8_t *data, size_ fail: vnc_client_error(vs); - free(mechname); + g_free(mechname); return -1; } @@ -614,12 +610,7 @@ void start_auth_sasl(VncState *vs) } VNC_DEBUG("Available mechanisms for client: '%s'\n", mechlist); - if (!(vs->sasl.mechlist = strdup(mechlist))) { - VNC_DEBUG("Out of memory"); - sasl_dispose(&vs->sasl.conn); - vs->sasl.conn = NULL; - goto authabort; - } + vs->sasl.mechlist = g_strdup(mechlist); mechlistlen = strlen(mechlist); vnc_write_u32(vs, mechlistlen); vnc_write(vs, mechlist, mechlistlen); -- 1.7.7.5