Skip to contentSkip to conversation

um: fix returns without va_end

PATCH Applied Geyslan G. Bem 2 participants 2 messages Dec 1, 2015 – Dec 8, 2015 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 um: fix returns without va_end

When using va_list ensure that va_start will be followed by va_end.

---
 arch/um/drivers/net_user.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/um/drivers/net_user.c +6 -4
index e697a41..e9f8445 100644
@@ -249,21 +249,23 @@ void close_addr(unsigned char *addr, unsigned char *netmask, void *arg)
 
 char *split_if_spec(char *str, ...)
 {
-	char **arg, *end;
+	char **arg, *end, *ret = NULL;
 	va_list ap;
 
 	va_start(ap, str);
 	while ((arg = va_arg(ap, char **)) != NULL) {
 		if (*str == '\0')
-			return NULL;
+			goto out;
 		end = strchr(str, ',');
 		if (end != str)
 			*arg = str;
 		if (end == NULL)
-			return NULL;
+			goto out;
 		*end++ = '\0';
 		str = end;
 	}
+	ret = str;
+out:
 	va_end(ap);
-	return str;
+	return ret;
 }
Signature · 1 line
2.6.2
#1 lore raw
Quoted 29 lines · Geyslan G. Bem

When using va_list ensure that va_start will be followed by va_end.

---
 arch/um/drivers/net_user.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/um/drivers/net_user.c +2 -3
index e697a41..e9f8445 100644
@@ -249,21 +249,23 @@ void close_addr(unsigned char *addr, unsigned char *netmask, void *arg)
 
 char *split_if_spec(char *str, ...)
 {
-       char **arg, *end;
+       char **arg, *end, *ret = NULL;
        va_list ap;
 
        va_start(ap, str);
        while ((arg = va_arg(ap, char **)) != NULL) {
                if (*str == '\0')
-                       return NULL;
+                       goto out;
                end = strchr(str, ',');
                if (end != str)
                        *arg = str;
                if (end == NULL)
-                       return NULL;

arch/um/drivers/net_user.c void close_addr(unsigned char *addr, unsigned char *netmask, void *arg) · line 271

Quoted 10 lines
arch/um/drivers/net_user.c +4 -1
+                       goto out;
                *end++ = '\0';
                str = end;
        }
+       ret = str;
+out:
        va_end(ap);
-       return str;
+       return ret;
 }

Applied! :)

Signature · 2 lines
Thanks,
//richard