Skip to content

Commit

Permalink
vl: fix direct firmware directories leak
Browse files Browse the repository at this point in the history
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: Marc-André Lureau <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
elmarco authored and bonzini committed Jan 16, 2018
1 parent 87c258c commit 3547112
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 3547112

Please sign in to comment.