commit 28b879ac47b872af6e8c5e86d76806c69338434d
author Chen Wei <weichen302@icloud.com> Tue Feb 17 22:07:35 2015 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Tue Feb 17 22:07:35 2015 +0000
tree 572be89cf895db04a5e3b971e30ab2cec32c39f5
parent caeea190f12efd20139f694aac4942d1ac00019f

Fix trivial memory leaks to quieten valgrind.

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index e903a24..e6dabbf 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -627,6 +627,8 @@
     }
   
 #ifdef HAVE_LINUX_NETWORK
+  free(hdr);
+  free(data);
   if (option_bool(OPT_DEBUG)) 
     prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
 #endif

src/option.c

diff --git a/src/option.c b/src/option.c
index e4b4865..ae0ad00 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4361,7 +4361,7 @@
 {
   char *buff = opt_malloc(MAXDNAME);
   int option, conffile_opt = '7', testmode = 0;
-  char *arg, *conffile = CONFFILE;
+  char *arg, *conffile = NULL;
       
   opterr = 0;
 
@@ -4476,7 +4476,14 @@
     }
 
   if (conffile)
-    one_file(conffile, conffile_opt);
+    {
+      one_file(conffile, conffile_opt);
+      free(conffile);
+    }
+  else
+    {
+      one_file(CONFFILE, conffile_opt);
+    }
 
   /* port might not be known when the address is parsed - fill in here */
   if (daemon->servers)