fix segfault or loading of invalid counters in ip[6]tables-restore (Olaf Rempel)...

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index cf69a6c7b299af855f4d1029295a93688c52b556..f7eac6802016bcc9d6e93682dc6675ab4ed35af8 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -266,7 +266,10 @@ int main(int argc, char *argv[])
                                        char *ctrs;
                                        ctrs = strtok(NULL, " \t\n");
 
-                                       parse_counters(ctrs, &count);
+                                       if (!ctrs || !parse_counters(ctrs, &count))
+                                               exit_error(PARAMETER_PROBLEM,
+                                                         "invalid policy counters "
+                                                         "for chain '%s'\n", chain);
 
                                } else {
                                        memset(&count, 0, 

diff --git a/iptables-restore.c b/iptables-restore.c
index e2872cde80488bd36ea9bb42bd955b3334a51a22..cc49c738b2ced53f4cf273ada89f1799dc005e62 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -269,7 +269,10 @@ main(int argc, char *argv[])
                                        char *ctrs;
                                        ctrs = strtok(NULL, " \t\n");
 
-                                       parse_counters(ctrs, &count);
+                                       if (!ctrs || !parse_counters(ctrs, &count))
+                                               exit_error(PARAMETER_PROBLEM,
+                                                          "invalid policy counters "
+                                                          "for chain '%s'\n", chain);
 
                                } else {
                                        memset(&count, 0,