ubus: do not overwrite ipset name attribute

[project/firewall3.git] / options.c

diff --git a/options.c b/options.c
index 5184346d2d40b51abd7c98b4c875bf2c57cd2d00..7870143b03f55297466a6540efd3730d38773f49 100644 (file)
--- a/options.c
+++ b/options.c
@@ -568,7 +568,7 @@ fw3_parse_icmptype(void *ptr, const char *val, bool is_list)
                }
 
                icmp.type6     = icmp.type;
-               icmp.code6_min = icmp.code_max;
+               icmp.code6_min = icmp.code_min;
                icmp.code6_max = icmp.code_max;
 
                v4 = true;
@@ -939,7 +939,7 @@ fw3_parse_setmatch(void *ptr, const char *val, bool is_list)
                return false;
        }
 
-       strncpy(m->name, p, sizeof(m->name));
+       strncpy(m->name, p, sizeof(m->name) - 1);
 
        for (i = 0, p = strtok(NULL, " \t,");
             i < 3 && p != NULL;