From 36166ca64480b68bb78055020f2cca1473d62b89 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 3 Oct 2014 22:50:52 +0200 Subject: [PATCH] htsmsg: fix htsmsg_get_str_multi() - coverity --- src/htsmsg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/htsmsg.c b/src/htsmsg.c index 05082081..db79c09b 100644 --- a/src/htsmsg.c +++ b/src/htsmsg.c @@ -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; }