mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

conf.c: fix handling of NULL string values

Browse source 
Make sure that we do not crash when encountering configuration nodes
with a NULL string value, or that at least we run into an assert().

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2009-07-10 07:26:29 +02:00
parent e2317969e1
commit efda3e2bc7
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/conf.c
View file

@ -1242,20 +1242,17 @@ static int parse_defs(snd_config_t *father, input_t *input, int skip, int overri
static void string_print(char *str, int id, snd_output_t *out) static void string_print(char *str, int id, snd_output_t *out)
{ {
unsigned char *p = (unsigned char *)str; unsigned char *p = (unsigned char *)str;
if (!p || !*p) {
snd_output_puts(out, "''");
return;
}
if (!id) { if (!id) {
switch (*p) { switch (*p) {
case 0:
assert(0);
break;
case '0' ... '9': case '0' ... '9':
case '-': case '-':
goto quoted; goto quoted;
} }
} }
if (!*p) {
snd_output_puts(out, "''");
return;
}
loop: loop:
switch (*p) { switch (*p) {
case 0: case 0:
@ -2445,6 +2442,7 @@ int snd_config_save(snd_config_t *config, snd_output_t *out)
} \ } \
if (snd_config_get_string(res, &key) < 0) \ if (snd_config_get_string(res, &key) < 0) \
break; \ break; \
assert(key); \
if (!first && (strcmp(key, old_key) == 0 || maxloop <= 0)) { \ if (!first && (strcmp(key, old_key) == 0 || maxloop <= 0)) { \
if (maxloop == 0) \ if (maxloop == 0) \
SNDERR("maximum loop count reached (circular configuration?)"); \ SNDERR("maximum loop count reached (circular configuration?)"); \
@ -2670,6 +2668,7 @@ static int snd_config_hooks_call(snd_config_t *root, snd_config_t *config, snd_c
SNDERR("Invalid type for field func"); SNDERR("Invalid type for field func");
return err; return err;
} }
assert(str);
err = snd_config_search_definition(root, "hook_func", str, &func_conf); err = snd_config_search_definition(root, "hook_func", str, &func_conf);
if (err >= 0) { if (err >= 0) {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
@ -2918,6 +2917,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
if (snd_config_search(root, fdriver, &n) >= 0) { if (snd_config_search(root, fdriver, &n) >= 0) {
if (snd_config_get_string(n, &driver) < 0) if (snd_config_get_string(n, &driver) < 0)
goto __err; goto __err;
assert(driver);
while (1) { while (1) {
char *s = strchr(driver, '.'); char *s = strchr(driver, '.');
if (s == NULL) if (s == NULL)
@ -3414,7 +3414,7 @@ static int _snd_config_expand(snd_config_t *src,
snd_config_t *val; snd_config_t *val;
snd_config_t *vars = private_data; snd_config_t *vars = private_data;
snd_config_get_string(src, &s); snd_config_get_string(src, &s);
if (*s == '$') { if (s && *s == '$') {
s++; s++;
if (snd_config_search(vars, s, &val) < 0) if (snd_config_search(vars, s, &val) < 0)
return 0; return 0;
@ -3466,6 +3466,7 @@ static int _snd_config_evaluate(snd_config_t *src,
SNDERR("Invalid type for @func"); SNDERR("Invalid type for @func");
return err; return err;
} }
assert(str);
err = snd_config_search_definition(root, "func", str, &func_conf); err = snd_config_search_definition(root, "func", str, &func_conf);
if (err >= 0) { if (err >= 0) {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
@ -3878,7 +3879,7 @@ static int parse_args(snd_config_t *subs, const char *str, snd_config_t *defs)
goto _err; goto _err;
} }
err = snd_config_get_string(typ, &tmp); err = snd_config_get_string(typ, &tmp);
if (err < 0) if (err < 0 || !tmp)
goto _invalid_type; goto _invalid_type;
if (strcmp(tmp, "integer") == 0) { if (strcmp(tmp, "integer") == 0) {
long v; long v;