Changeset 467 for trunk/wifidog/src/fw_iptables.c

Timestamp:

02/20/05 16:29:15 (8 years ago)

Author:

minaguib

Message:

* New safe.c with safe_malloc, safe_strdup, safe_asprintf and safe_vasprintf with propper logging and exit when error. Replaced all instances of original with safe versions in all files
* Fix memory leak in iptables_fw_counters_update

Files:

• trunk/wifidog/src/fw_iptables.c (modified) (9 diffs)

trunk/wifidog/src/fw_iptables.c

@@ -41 +41 @@
 #include "common.h"
 
+#include "safe.h"
 #include "conf.h"
 #include "fw_iptables.h"
@@ -69 +70 @@
 
     va_start(vlist, format);
-    vasprintf(&fmt_cmd, format, vlist);
-    asprintf(&cmd, "iptables %s", fmt_cmd);
+    safe_vasprintf(&fmt_cmd, format, vlist);
+         va_end(vlist);
+
+    safe_asprintf(&cmd, "iptables %s", fmt_cmd);
+
+    free(fmt_cmd);
+
     debug(LOG_DEBUG, "Executing command: %s", cmd);
         
     rc = execute(cmd, fw_quiet);
 
-    free(fmt_cmd);
     free(cmd);
 
@@ -97 +102 @@
     
     if (rule->block_allow == 1) {
-        mode = strdup("ACCEPT");
+        mode = safe_strdup("ACCEPT");
     } else {
-        mode = strdup("REJECT");
+        mode = safe_strdup("REJECT");
     }
     
@@ -122 +127 @@
     /* XXX The buffer command, an automatic variable, will get cleaned
      * off of the stack when we return, so we strdup() it. */
-    return(strdup(command));
+    return(safe_strdup(command));
 }
 
@@ -189 +194 @@
     config = config_get_config();
          LOCK_CONFIG();
-         gw_interface = strdup(config->gw_interface);
+         gw_interface = safe_strdup(config->gw_interface);
          gw_port = config->gw_port;
          UNLOCK_CONFIG();
@@ -343 +348 @@
         int deleted = 0;
 
-        asprintf(&command, "iptables -t %s -L %s -n --line-numbers -v", table, chain);
+        safe_asprintf(&command, "iptables -t %s -L %s -n --line-numbers -v", table, chain);
 
         if ((p = popen(command, "r"))) {
@@ -356 +361 @@
                                 if (sscanf(line, "%9[0-9]", rulenum) == 1) {
                                         /* Delete the rule: */
-                                        asprintf(&command2, "-t %s -D %s %s", table, chain, rulenum);
+                                        safe_asprintf(&command2, "-t %s -D %s %s", table, chain, rulenum);
                                         iptables_do_command(command2);
                                         free(command2);
@@ -416 +421 @@
 
     /* Look for outgoing traffic */
-    asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_OUTGOING);
-    if (!(output = popen(script, "r"))) {
+    safe_asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_OUTGOING);
+    output = popen(script, "r");
+    free(script);
+    if (!output) {
         debug(LOG_ERR, "popen(): %s", strerror(errno));
         return -1;
     }
-    free(script);
 
     /* skip the first two lines */
@@ -453 +459 @@
 
     /* Look for incoming traffic */
-    asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_INCOMING);
-    if (!(output = popen(script, "r"))) {
+    safe_asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_INCOMING);
+    output = popen(script, "r");
+    free(script);
+    if (!output) {
         debug(LOG_ERR, "popen(): %s", strerror(errno));
         return -1;
     }
-    free(script);
 
     /* skip the first two lines */