Commit 35471127 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

vl: fix direct firmware directories leak 



Note that data_dir[] will now point to allocated strings.

Fixes:
Direct leak of 16 byte(s) in 1 object(s) allocated from:
    #0 0x7f1448181850 in malloc (/lib64/libasan.so.4+0xde850)
    #1 0x7f1446ed8f0c in g_malloc ../glib/gmem.c:94
    #2 0x7f1446ed91cf in g_malloc_n ../glib/gmem.c:331
    #3 0x7f1446ef739a in g_strsplit ../glib/gstrfuncs.c:2364
    #4 0x55cf276439d7 in main /home/elmarco/src/qq/vl.c:4311
    #5 0x7f143dfad039 in __libc_start_main (/lib64/libc.so.6+0x21039)

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20180104160523.22995-10-marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 87c258cd

vl.c

+6 −3
Original line number Diff line number Diff line
@@ -2318,7 +2318,7 @@ static void qemu_add_data_dir(const char *path) 
            return; /* duplicate */

        }

    }

    data_dir[data_dir_idx++] = path;

    data_dir[data_dir_idx++] = g_strdup(path);

}



static inline bool nonempty_str(const char *str)
@@ -3078,7 +3078,7 @@ int main(int argc, char **argv, char **envp) 
    Error *main_loop_err = NULL;

    Error *err = NULL;

    bool list_data_dirs = false;

    char **dirs;

    char *dir, **dirs;

    typedef struct BlockdevOptions_queue {

        BlockdevOptions *bdo;

        Location loc;
@@ -4181,9 +4181,12 @@ int main(int argc, char **argv, char **envp) 
    for (i = 0; dirs[i] != NULL; i++) {

        qemu_add_data_dir(dirs[i]);

    }

    g_strfreev(dirs);



    /* try to find datadir relative to the executable path */

    qemu_add_data_dir(os_find_datadir());

    dir = os_find_datadir();

    qemu_add_data_dir(dir);

    g_free(dir);



    /* add the datadir specified when building */

    qemu_add_data_dir(CONFIG_QEMU_DATADIR);