diff options
| author | malc <av1474@comtv.ru> | 2011-11-02 02:16:34 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-11-02 02:16:34 +0400 |
| commit | ef26ee0e6c67d415f8b22850f9f13a972ada8be1 (patch) | |
| tree | c18a9cc2a9f213c8a37473f9b7aa001a99898547 /ui/vnc.c | |
| parent | dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37 (diff) | |
| parent | e1c2008af64487e7d3cec615612b7f467ebe9bc8 (diff) | |
| download | focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.tar.gz focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'ui/vnc.c')
| -rw-r--r-- | ui/vnc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/vnc.c b/ui/vnc.c index 32d4cb70cd..40018f70f1 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -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; } } |