mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf.c: fix handling of NULL ids

Browse source 
Make sure that we do not crash when encountering configuration nodes
with a NULL id.  Furthermore, since we cannot avoid having NULL ids
anyway, allow the id of a top-level node to be reset to NULL.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2009-07-09 07:38:26 +02:00
parent a7f744888e
commit 2c4b3c7d09
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/conf.c
View file

@ -1522,10 +1522,16 @@ int snd_config_get_id(const snd_config_t *config, const char **id)
int snd_config_set_id(snd_config_t *config, const char *id) int snd_config_set_id(snd_config_t *config, const char *id)
{ {
char *new_id; char *new_id;
assert(config && id); assert(config);
new_id = strdup(id); if (id) {
if (!new_id) new_id = strdup(id);
return -ENOMEM; if (!new_id)
return -ENOMEM;
} else {
if (config->father)
return -EINVAL;
new_id = NULL;
}
free(config->id); free(config->id);
config->id = new_id; config->id = new_id;
return 0; return 0;
@ -1638,6 +1644,8 @@ int snd_config_add(snd_config_t *father, snd_config_t *leaf)
{ {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
assert(father && leaf); assert(father && leaf);
if (!leaf->id)
return -EINVAL;
snd_config_for_each(i, next, father) { snd_config_for_each(i, next, father) {
snd_config_t *n = snd_config_iterator_entry(i); snd_config_t *n = snd_config_iterator_entry(i);
if (strcmp(leaf->id, n->id) == 0) if (strcmp(leaf->id, n->id) == 0)
@ -2286,7 +2294,10 @@ int snd_config_get_ascii(const snd_config_t *config, char **ascii)
int snd_config_test_id(const snd_config_t *config, const char *id) int snd_config_test_id(const snd_config_t *config, const char *id)
{ {
assert(config && id); assert(config && id);
return strcmp(config->id, id); if (config->id)
return strcmp(config->id, id);
else
return -1;
} }
/** /**
@ -3350,7 +3361,7 @@ static int _snd_config_expand(snd_config_t *src,
switch (pass) { switch (pass) {
case SND_CONFIG_WALK_PASS_PRE: case SND_CONFIG_WALK_PASS_PRE:
{ {
if (strcmp(id, "@args") == 0) if (id && strcmp(id, "@args") == 0)
return 0; return 0;
err = snd_config_make_compound(dst, id, src->u.compound.join); err = snd_config_make_compound(dst, id, src->u.compound.join);
if (err < 0) if (err < 0)