From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 3 Oct 2014 15:20:19 +0000 (+0200)
Subject: htsmsg: add missing va_end() calls - coverity
X-Git-Tag: v4.1~1173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52c812280a521dd2cc094d2896b136da770ac02a;p=thirdparty%2Ftvheadend.git

htsmsg: add missing va_end() calls - coverity
---

diff --git a/src/htsmsg.c b/src/htsmsg.c
index a5e069d49..521f0cf1d 100644
--- a/src/htsmsg.c
+++ b/src/htsmsg.c
@@ -651,10 +651,12 @@ htsmsg_get_map_multi(htsmsg_t *msg, ...)
 {
   va_list ap;
   const char *n;
-  va_start(ap, msg);
 
+  va_start(ap, msg);
   while(msg != NULL && (n = va_arg(ap, char *)) != NULL)
     msg = htsmsg_get_map(msg, n);
+  va_end(ap);
+
   return msg;
 }
 
@@ -667,18 +669,20 @@ htsmsg_get_str_multi(htsmsg_t *msg, ...)
   va_list ap;
   const char *n;
   htsmsg_field_t *f;
-  va_start(ap, msg);
 
+  va_start(ap, msg);
   while((n = va_arg(ap, char *)) != NULL) {
     if((f = htsmsg_field_find(msg, n)) == NULL)
-      return NULL;
+      break;
     else if(f->hmf_type == HMF_STR)
       return f->hmf_str;
     else if(f->hmf_type == HMF_MAP)
       msg = &f->hmf_msg;
     else
-      return NULL;
+      break;
   }
+  va_end(ap);
+
   return NULL;
 }