summary refs log tree commit diff stats
path: root/ui/vnc-auth-sasl.c
diff options
context:
space:
mode:
authormalc <av1474@comtv.ru>2011-11-02 02:16:34 +0400
committermalc <av1474@comtv.ru>2011-11-02 02:16:34 +0400
commitef26ee0e6c67d415f8b22850f9f13a972ada8be1 (patch)
treec18a9cc2a9f213c8a37473f9b7aa001a99898547 /ui/vnc-auth-sasl.c
parentdd7b25b5b47df8aaf5580faaf3f60b2a1b779c37 (diff)
parente1c2008af64487e7d3cec615612b7f467ebe9bc8 (diff)
downloadfocaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.tar.gz
focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.zip
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'ui/vnc-auth-sasl.c')
-rw-r--r--ui/vnc-auth-sasl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index e96095ab94..23b1bf5c4d 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -34,7 +34,7 @@ void vnc_sasl_client_cleanup(VncState *vs)
         vs->sasl.runSSF = vs->sasl.waitWriteSSF = vs->sasl.wantSSF = 0;
         vs->sasl.encodedLength = vs->sasl.encodedOffset = 0;
         vs->sasl.encoded = NULL;
-        free(vs->sasl.username);
+        g_free(vs->sasl.username);
         free(vs->sasl.mechlist);
         vs->sasl.username = vs->sasl.mechlist = NULL;
         sasl_dispose(&vs->sasl.conn);
@@ -506,7 +506,7 @@ void start_auth_sasl(VncState *vs)
         goto authabort;
 
     if (!(remoteAddr = vnc_socket_remote_addr("%s;%s", vs->csock))) {
-        free(localAddr);
+        g_free(localAddr);
         goto authabort;
     }
 
@@ -518,8 +518,8 @@ void start_auth_sasl(VncState *vs)
                           NULL, /* Callbacks, not needed */
                           SASL_SUCCESS_DATA,
                           &vs->sasl.conn);
-    free(localAddr);
-    free(remoteAddr);
+    g_free(localAddr);
+    g_free(remoteAddr);
     localAddr = remoteAddr = NULL;
 
     if (err != SASL_OK) {