firewall3: check the return value of fw3_parse_options()

The return value of fw3_parse_options() should be checked.

Signed-off-by: Pierre Lebleu <pme.lebleu@gmail.com>

diff --git a/defaults.c b/defaults.c
index 8afbf9a..85a3750 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -107,7 +107,8 @@ fw3_load_defaults(struct fw3_state *state, struct uci_package *p)
                        continue;
                }
 
                        continue;
                }
 

-               fw3_parse_options(&state->defaults, fw3_flag_opts, s);
+               if(!fw3_parse_options(&state->defaults, fw3_flag_opts, s))
+                       warn_elem(e, "has invalid options");

 
                check_policy(e, &defs->policy_input, "input");
                check_policy(e, &defs->policy_output, "output");
 
                check_policy(e, &defs->policy_input, "input");
                check_policy(e, &defs->policy_output, "output");

diff --git a/forwards.c b/forwards.c
index 997c307..9b369f3 100644 (file)
--- a/forwards.c
+++ b/forwards.c
@@ -54,7 +54,8 @@ fw3_load_forwards(struct fw3_state *state, struct uci_package *p)
 
                forward->enabled = true;
 
 
                forward->enabled = true;
 

-               fw3_parse_options(forward, fw3_forward_opts, s);
+               if (!fw3_parse_options(forward, fw3_forward_opts, s))
+                       warn_elem(e, "has invalid options");

 
                if (!forward->enabled)
                {
 
                if (!forward->enabled)
                {

diff --git a/includes.c b/includes.c
index a9a75cb..a2b37a3 100644 (file)
--- a/includes.c
+++ b/includes.c
@@ -54,7 +54,8 @@ fw3_load_includes(struct fw3_state *state, struct uci_package *p)
                include->name = e->name;
                include->enabled = true;
 
                include->name = e->name;
                include->enabled = true;
 

-               fw3_parse_options(include, fw3_include_opts, s);
+               if (!fw3_parse_options(include, fw3_include_opts, s))
+                       warn_elem(e, "has invalid options");

 
                if (!include->enabled)
                {
 
                if (!include->enabled)
                {

diff --git a/ipsets.c b/ipsets.c
index 0325944..7a72fd3 100644 (file)
--- a/ipsets.c
+++ b/ipsets.c
@@ -239,7 +239,8 @@ fw3_load_ipsets(struct fw3_state *state, struct uci_package *p)
                if (!ipset)
                        continue;
 
                if (!ipset)
                        continue;
 

-               fw3_parse_options(ipset, fw3_ipset_opts, s);
+               if (!fw3_parse_options(ipset, fw3_ipset_opts, s))
+                       warn_elem(e, "has invalid options");

 
                if (ipset->external)
                {
 
                if (ipset->external)
                {

diff --git a/zones.c b/zones.c
index 26f6215..2aa7473 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -171,7 +171,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
                if (!zone)
                        continue;
 
                if (!zone)
                        continue;
 

-               fw3_parse_options(zone, fw3_zone_opts, s);
+               if (!fw3_parse_options(zone, fw3_zone_opts, s))
+                       warn_elem(e, "has invalid options");

 
                if (!zone->enabled)
                {
 
                if (!zone->enabled)
                {