stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

htsmsg: fix htsmsg_get_str_multi() - coverity

Browse source
This commit is contained in:
Jaroslav Kysela 2014-10-03 22:50:52 +02:00
parent 297c79c9f6
commit 36166ca644
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/htsmsg.c
View file

@ -667,23 +667,24 @@ const char *
htsmsg_get_str_multi(htsmsg_t *msg, ...)
{
va_list ap;
const char *n;
const char *n, *r = NULL;
htsmsg_field_t *f;
va_start(ap, msg);
while((n = va_arg(ap, char *)) != NULL) {
if((f = htsmsg_field_find(msg, n)) == NULL)
break;
else if(f->hmf_type == HMF_STR)
return f->hmf_str;
else if(f->hmf_type == HMF_MAP)
else if(f->hmf_type == HMF_STR) {
r = f->hmf_str;
break;
} else if(f->hmf_type == HMF_MAP)
msg = &f->hmf_msg;
else
break;
}
va_end(ap);
return NULL;
return r;
}