OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ui/vnc: Fix use of free() instead of g_free()

Browse Source 
Please note that mechlist still uses malloc / strdup / free.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Stefan Weil 2011-10-07 21:15:20 +02:00 committed by Anthony Liguori
parent e589728b6f
commit ae878b172e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/vnc-auth-sasl.c
View File

@ -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) {

4
ui/vnc-enc-hextile.c
View File

@ -80,8 +80,8 @@ int vnc_hextile_send_framebuffer_update(VncState *vs, int x,
last_bg, last_fg, &has_bg, &has_fg);
}
}
free(last_fg);
free(last_bg);
g_free(last_fg);
g_free(last_bg);
return 1;
}

2
ui/vnc-tls.c
View File

@ -413,7 +413,7 @@ void vnc_tls_client_cleanup(struct VncState *vs)
vs->tls.session = NULL;
}
vs->tls.wiremode = VNC_WIREMODE_CLEAR;
free(vs->tls.dname);
g_free(vs->tls.dname);
}

8
ui/vnc.c
View File

@ -2911,7 +2911,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
if ((saslErr = sasl_server_init(NULL, "qemu")) != SASL_OK) {
fprintf(stderr, "Failed to initialize SASL auth %s",
sasl_errstring(saslErr, NULL, NULL));
free(vs->display);
g_free(vs->display);
vs->display = NULL;
return -1;
}
@ -2925,7 +2925,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
else
vs->lsock = inet_connect(display, SOCK_STREAM);
if (-1 == vs->lsock) {
free(vs->display);
g_free(vs->display);
vs->display = NULL;
return -1;
} else {
@ -2946,10 +2946,10 @@ int vnc_display_open(DisplayState *ds, const char *display)
vs->lsock = inet_listen(display, dpy, 256, SOCK_STREAM, 5900);
}
if (-1 == vs->lsock) {
free(dpy);
g_free(dpy);
return -1;
} else {
free(vs->display);
g_free(vs->display);
vs->display = dpy;
}
}