motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

oslib: do not call g_strdup from qemu_get_exec_dir

Browse source 
Just return the directory without requiring the caller to free it.
This also removes a bogus check for NULL in os_find_datadir and
module_load_one; g_strdup of a static variable cannot return NULL.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-08-18 12:11:02 +02:00
parent 05512f55aa
commit a4c13869f9
7 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
os-posix.c
View file

@ -90,13 +90,9 @@ void os_setup_signal_handling(void)
*/
char *os_find_datadir(void)
{
g_autofree char *exec_dir = NULL;
g_autofree char *dir = NULL;
exec_dir = qemu_get_exec_dir();
g_return_val_if_fail(exec_dir != NULL, NULL);
dir = g_build_filename(exec_dir, "pc-bios", NULL);
dir = g_build_filename(qemu_get_exec_dir(), "pc-bios", NULL);
if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
return g_steal_pointer(&dir);
}