asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 04:15:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsactl: fix error path code in init_parse.c

Browse source 
If initialization file (-i option) does not exists, the free_space()
function was called with NULL pointer.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2009-12-14 17:26:57 +01:00 committed by Jaroslav Kysela
parent 87ee474b1d
commit 1247c3d8ac
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
alsactl/init_parse.c
View file

@ -1747,10 +1747,12 @@ int init(const char *filename, const char *cardname)
} }
first = 0; first = 0;
err = init_space(&space, card); err = init_space(&space, card);
if (err == 0 && if (err == 0) {
(space->rootdir = new_root_dir(filename)) != NULL) space->rootdir = new_root_dir(filename);
if (space->rootdir != NULL)
err = parse(space, filename); err = parse(space, filename);
free_space(space); free_space(space);
}
if (err < 0) if (err < 0)
break; break;
} }
@ -1762,11 +1764,13 @@ int init(const char *filename, const char *cardname)
} }
memset(&space, 0, sizeof(space)); memset(&space, 0, sizeof(space));
err = init_space(&space, card); err = init_space(&space, card);
if (err == 0 && if (err == 0) {
(space->rootdir = new_root_dir(filename)) != NULL) space->rootdir = new_root_dir(filename);
if (space->rootdir != NULL)
err = parse(space, filename); err = parse(space, filename);
free_space(space); free_space(space);
} }
}
error: error:
sysfs_cleanup(); sysfs_cleanup();
return err; return err;