From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Oct 2014 20:50:52 +0000 (+0200)
Subject: htsmsg: fix htsmsg_get_str_multi() - coverity
X-Git-Tag: v4.1~1131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36166ca64480b68bb78055020f2cca1473d62b89;p=thirdparty%2Ftvheadend.git

htsmsg: fix htsmsg_get_str_multi() - coverity
---

diff --git a/src/htsmsg.c b/src/htsmsg.c
index 05082081f..db79c09b4 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;
 }