canner without memory leak

diff --git a/app/receiver.c b/app/receiver.c
index 4585431201acde49190aecebaea4a4d47fc08b4e..46137d3e3115617ea8be0518e5b31a0a2bb5484a 100644 (file)
--- a/app/receiver.c
+++ b/app/receiver.c
@@ -93,14 +93,14 @@ while (proceed==true) {
       (void) prc_locking(appname,false,1);
       break;
     default     :       //end of task
-      (void) rou_loadconfig(config,false);
-      (void) prc_cleantitle();
       params=par_freeparams(params);
+      (void) rou_loadconfig(config,false);
       (void) sig_trapsignal(false,sig_alrm);
       (void) tls_modeunitls(false);
       (void) sig_modeunisig(false);
       (void) prc_modeuniprc(false);
       (void) rou_modesubrou(false);
+      (void) prc_cleantitle();
       proceed=false;
       break;
     }

diff --git a/app/scanner.c b/app/scanner.c
index 0723ba7c99c6d28323472bd3095e8674f4bcf104..062812e0399e835bc3d5a18b3718b51b0e61b065 100644 (file)
--- a/app/scanner.c
+++ b/app/scanner.c
@@ -91,7 +91,7 @@ while (proceed==true) {
           (void) snprintf(cst,sizeof(cst),"IP[%02d]: %s\t",num,rmtip);
           if (listed!=(char *)0) {
             (void) rou_asprintf(&report,"%s%s",cst,listed);
-            srv->credit-=10;
+            srv->credit+=(*dnsblk)->delta;
             if (srv->listing==(char *)0)
               srv->listing=strdup(listed);
             }
@@ -362,12 +362,12 @@ while (proceed==true) {
       (void) doscanning(FREQUENCY);
       break;
     default     :       //end of task
-      (void) prc_cleantitle();
       params=par_freeparams(params);
       (void) rou_loadconfig(config,false);
       (void) sig_trapsignal(false,sig_alrm);
       (void) sig_modeunisig(false);
       (void) rou_modesubrou(false);
+      (void) prc_cleantitle();
       (void) closelog();
       proceed=false;
       break;

diff --git a/lib/unidns.c b/lib/unidns.c
index be4bfcb4b09e0c6828f32e5d440679f717da8914..876d4e93b046488f6bdb63345dbd451ff5132e61 100644 (file)
--- a/lib/unidns.c
+++ b/lib/unidns.c
@@ -345,10 +345,11 @@ if ((entry!=(char *)0)&&(strlen(entry)>0)) {
   (void) memset(sitename,'\000',sizeof(sitename));
   sofar=0;
   if (sscanf(entry,"%d %s%n",&delta,sitename,&sofar)==2) {
-    BLKTYP *blk;
     char **targets;
+    BLKTYP *blk;
     char *ptr;
 
+    targets=(char **)0;
     blk=calloc(1,sizeof(BLKTYP));
     blk->delta=delta;
     blk->sitename=strdup(sitename);