firewall3: fix left shift on 64 bit systems in fw3_bitlen2netmask

[project/firewall3.git] / includes.c

diff --git a/includes.c b/includes.c
index 42d5b7a..e2450a8 100644 (file)
--- a/includes.c
+++ b/includes.c
@@ -47,13 +47,10 @@ fw3_load_includes(struct fw3_state *state, struct uci_package *p)
                if (strcmp(s->type, "include"))
                        continue;
 
-               include = malloc(sizeof(*include));
-
+               include = calloc(1, sizeof(*include));
                if (!include)
                        continue;
 
-               memset(include, 0, sizeof(*include));
-
                include->name = e->name;
                include->enabled = true;
 
@@ -135,7 +132,8 @@ fw3_print_includes(struct fw3_state *state, enum fw3_family family, bool reload)
                print_include(include);
        }
 
-       fw3_command_close();
+       if (exec)
+               fw3_command_close();
 }