fix case where somebody uses '-i +' as interface name (Ozgur AKAN)

diff --git a/ip6tables.c b/ip6tables.c
index 138eed9142903cfbffe55a9fe995204591a8058f..9e9a5290a4e66d73889e1eb490ec8bf065a90b23 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -840,7 +840,7 @@ parse_interface(const char *arg, char *vianame, unsigned char *mask)
                           " (%i)", arg, IFNAMSIZ-1);
 
        strcpy(vianame, arg);
-       if (vialen == 0)
+       if ((vialen == 0) || (vialen == 1 && vianame[0] == '+'))
                memset(mask, 0, IFNAMSIZ);
        else if (vianame[vialen - 1] == '+') {
                memset(mask, 0xFF, vialen - 1);

diff --git a/iptables.c b/iptables.c
index ae6538c049437c3880a089e360286246fb37df3b..4b0fe6c1e0a16be3bdc23c3894143dd1c848ec29 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -780,7 +780,7 @@ parse_interface(const char *arg, char *vianame, unsigned char *mask)
                           " (%i)", arg, IFNAMSIZ-1);
 
        strcpy(vianame, arg);
-       if (vialen == 0)
+       if ((vialen == 0) || (vialen == 1 && vianame[0] == '+'))
                memset(mask, 0, IFNAMSIZ);
        else if (vianame[vialen - 1] == '+') {
                memset(mask, 0xFF, vialen - 1);