Commit 64641d87 authored by Markus Armbruster's avatar Markus Armbruster Committed by Gerd Hoffmann
Browse files

vnc: Drop superfluous conditionals around g_free() 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent d279279e

ui/vnc-tls.c

+2 −4
Original line number Diff line number Diff line
@@ -443,10 +443,8 @@ static int vnc_set_x509_credential(VncDisplay *vd, 
{

    struct stat sb;



    if (*cred) {

    g_free(*cred);

    *cred = NULL;

    }



    *cred = g_malloc(strlen(certdir) + strlen(filename) + 2);

ui/vnc.c

+4 −8
Original line number Diff line number Diff line
@@ -2972,10 +2972,8 @@ static void vnc_display_close(DisplayState *ds) 


    if (!vs)

        return;

    if (vs->display) {

    g_free(vs->display);

    vs->display = NULL;

    }

    if (vs->lsock != -1) {

        qemu_set_fd_handler2(vs->lsock, NULL, NULL, NULL, NULL);

        close(vs->lsock);
@@ -3010,10 +3008,8 @@ int vnc_display_password(DisplayState *ds, const char *password) 
        return -EINVAL;

    }



    if (vs->password) {

    g_free(vs->password);

    vs->password = NULL;

    }

    if (password) {

        vs->password = g_strdup(password);

    }