trojanscan and lua now use nsmalloc.

diff --git a/lua/lua.c b/lua/lua.c
index b958b5200f05449e393c0bc01f04969bb379c55e..c23da67a7610c3ffa0eec1f7441e9bb6dfeb61a7 100644 (file)
--- a/lua/lua.c
+++ b/lua/lua.c
@@ -167,6 +167,17 @@ void lua_loadscripts(void) {
   }
 }
 
+/* taken from the lua manual, modified to use nsmalloc */
+static void *lua_nsmalloc(void *ud, void *ptr, size_t osize, size_t nsize) {
+  if(nsize == 0) {
+    if(ptr != NULL)
+      luafree(ptr);
+    return NULL;
+  }
+
+  return luarealloc(ptr, nsize);
+}
+
 lua_State *lua_loadscript(char *file) {
   char fullpath[LUA_PATHLEN];
   int top;
@@ -181,7 +192,7 @@ lua_State *lua_loadscript(char *file) {
   if(lua_scriptloaded(file))
     return NULL;
 
-  l = lua_newstate(, NULL);
+  l = lua_newstate(lua_nsmalloc, NULL);
   if(!l)
     return NULL;
 

diff --git a/lua/lua.h b/lua/lua.h
index 5fd0e6f783ce94e185d27980a5547cabd518bb7f..957040c475f86edcd4d970de65ff373828a611ba 100644 (file)
--- a/lua/lua.h
+++ b/lua/lua.h
@@ -23,6 +23,7 @@
 #include "luasocket.h"
 
 #define luamalloc(x) nsmalloc(POOL_LUA, x)
+#define luarealloc(x, y) nsrealloc(POOL_LUA, x, y)
 #define luafree(x) nsfree(POOL_LUA, x)
 
 /*** defines ************************************/

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index 5cadf3af578b7d938ac7bfab4ee7e31b4f9107cc..52c28c9159e7b46abffa66ce99bcec4781de1295 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -15,6 +15,9 @@
 #include "../lib/strlfunc.h"
 #include "../lib/version.h"
 
+#define tmalloc(x)     nsmalloc(POOL_TROJANSCAN, x)
+#define tfree(x)       nsfree(POOL_TROJANSCAN, x)
+
 MODULE_VERSION(TROJANSCAN_VERSION);
 
 void trojanscan_phrasematch(channel *chp, nick *sender, trojanscan_phrases *phrase, char messagetype, char *matchbuf);
@@ -94,7 +97,7 @@ void _fini(void) {
     deleteschedule(rp->schedule, &trojanscan_dopart, (void *)rp);
     oldrp = rp;
     rp = rp->next;
-    free(oldrp);
+    tfree(oldrp);
   }
   
   while(rj) {
@@ -102,7 +105,7 @@ void _fini(void) {
     freesstring(rj->channel);
     oldrj = rj;
     rj = rj->next;
-    free(oldrj);
+    tfree(oldrj);
   }
 
   if(trojanscan_initialschedule)
@@ -336,17 +339,17 @@ void trojanscan_free_database(void) {
   int i;
   for(i=0;i<trojanscan_database.total_channels;i++)
     freesstring(trojanscan_database.channels[i].name);
-  free(trojanscan_database.channels);
+  tfree(trojanscan_database.channels);
   for(i=0;i<trojanscan_database.total_phrases;i++) {
     if (trojanscan_database.phrases[i].phrase)
       pcre_free(trojanscan_database.phrases[i].phrase);
     if (trojanscan_database.phrases[i].hint)
       pcre_free(trojanscan_database.phrases[i].hint);
   }
-  free(trojanscan_database.phrases);
+  tfree(trojanscan_database.phrases);
   for(i=0;i<trojanscan_database.total_worms;i++)
     freesstring(trojanscan_database.worms[i].name);
-  free(trojanscan_database.worms);
+  tfree(trojanscan_database.worms);
   trojanscan_database.total_channels = 0;
   trojanscan_database.total_phrases = 0;
   trojanscan_database.total_worms = 0;
@@ -472,7 +475,7 @@ void trojanscan_read_database(int first_time) {
     if ((res = trojanscan_database_store_result(&trojanscan_sql))) {
       trojanscan_database.total_channels = trojanscan_database_num_rows(res);
       if (trojanscan_database.total_channels > 0) {
-        if ((trojanscan_database.channels = (trojanscan_channels *)malloc(sizeof(trojanscan_channels) * trojanscan_database.total_channels))) {
+        if ((trojanscan_database.channels = (trojanscan_channels *)tmalloc(sizeof(trojanscan_channels) * trojanscan_database.total_channels))) {
           if ((trojanscan_database.total_channels>0) && trojanscan_database.channels) {
             i = 0;
             while((sqlrow = trojanscan_database_fetch_row(res))) {
@@ -491,7 +494,7 @@ void trojanscan_read_database(int first_time) {
     if ((res = trojanscan_database_store_result(&trojanscan_sql))) {
       trojanscan_database.total_worms = trojanscan_database_num_rows(res);
       if (trojanscan_database.total_worms > 0) {
-        if ((trojanscan_database.worms = (trojanscan_worms *)malloc(sizeof(trojanscan_worms) * trojanscan_database.total_worms))) {
+        if ((trojanscan_database.worms = (trojanscan_worms *)tmalloc(sizeof(trojanscan_worms) * trojanscan_database.total_worms))) {
           i = 0;
           while((sqlrow = trojanscan_database_fetch_row(res))) {
             trojanscan_database.worms[i].id = atoi(sqlrow[0]);
@@ -522,7 +525,7 @@ void trojanscan_read_database(int first_time) {
     if ((res = trojanscan_database_store_result(&trojanscan_sql))) {
       trojanscan_database.total_phrases = trojanscan_database_num_rows(res);
       if (trojanscan_database.total_phrases > 0) {
-        if ((trojanscan_database.phrases = (trojanscan_phrases *)malloc(sizeof(trojanscan_phrases) * trojanscan_database.total_phrases))) {
+        if ((trojanscan_database.phrases = (trojanscan_phrases *)tmalloc(sizeof(trojanscan_phrases) * trojanscan_database.total_phrases))) {
           i = 0;
           while((sqlrow = trojanscan_database_fetch_row(res))) {
             trojanscan_database.phrases[i].id = atoi(sqlrow[0]);
@@ -618,7 +621,7 @@ void trojanscan_free_channels(void) {
   if(trojanscan_chans) {
     for(i=0;i<trojanscan_activechans;i++) 
       freesstring(trojanscan_chans[i].channel);
-    free(trojanscan_chans);
+    tfree(trojanscan_chans);
     trojanscan_chans = NULL;
     trojanscan_activechans = 0;
   }
@@ -1129,7 +1132,7 @@ struct trojanscan_realchannels *trojanscan_allocaterc(char *chan) {
     return NULL;
   }
 
-  rc = (struct trojanscan_realchannels *)malloc(sizeof(struct trojanscan_realchannels));
+  rc = (struct trojanscan_realchannels *)tmalloc(sizeof(struct trojanscan_realchannels));
 
   rc->next = NULL;
   rc->clone = clonep;
@@ -1384,7 +1387,7 @@ int trojanscan_add_ll(struct trojanscan_prechannels **head, struct trojanscan_pr
   
   for(position=*head;position;lastitem=position,position=position->next) {
     if (!ircd_strcmp(position->name->content, newitem->name->content)) {
-      free(newitem);
+      tfree(newitem);
       return 0;
     }
     if (!location && (position->size < newitem->size)) {
@@ -1415,9 +1418,10 @@ void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count)
   struct trojanscan_templist *markedlist = NULL;
 
   if(count > 0) {
-    markedlist = (struct trojanscan_templist *)calloc(count, sizeof(struct trojanscan_templist));
+    markedlist = (struct trojanscan_templist *)malloc(count * sizeof(struct trojanscan_templist));
     if (!markedlist)
       return;
+    memset(markedlist, 0, sizeof(struct trojanscan_templist) * count);
   }
   
   for(i=0;i<trojanscan_activechans;i++) {
@@ -1467,7 +1471,7 @@ void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count)
     }
   }
   
-  free(markedlist);
+  tfree(markedlist);
 }
 
 void trojanscan_fill_channels(void *arg) {
@@ -1477,7 +1481,7 @@ void trojanscan_fill_channels(void *arg) {
   chanindex *chn;
   
   for (count=i=0;i<trojanscan_database.total_channels;i++) {
-    lp = (trojanscan_prechannels *)malloc(sizeof(trojanscan_prechannels));
+    lp = (trojanscan_prechannels *)tmalloc(sizeof(trojanscan_prechannels));
     lp->name = trojanscan_database.channels[i].name;
     lp->size = 65535;
     lp->exempt = trojanscan_database.channels[i].exempt;
@@ -1489,7 +1493,7 @@ void trojanscan_fill_channels(void *arg) {
   for (i=0;i<CHANNELHASHSIZE;i++) {
     for(chn=chantable[i];chn;chn=chn->next) {
       if (chn->channel && !IsKey(chn->channel) && !IsInviteOnly(chn->channel) && !IsRegOnly(chn->channel) && (chn->channel->users->totalusers >= trojanscan_minchansize)) {
-        lp = (trojanscan_prechannels *)malloc(sizeof(trojanscan_prechannels));
+        lp = (trojanscan_prechannels *)tmalloc(sizeof(trojanscan_prechannels));
         lp->name = chn->name;
         lp->size = chn->channel->users->totalusers;
         lp->exempt = 0;
@@ -1505,7 +1509,8 @@ void trojanscan_fill_channels(void *arg) {
   trojanscan_watch_clone_update(head, count);
   
   trojanscan_free_channels();
-  trojanscan_chans = (struct trojanscan_inchannel *)calloc(count, sizeof(struct trojanscan_inchannel));
+  trojanscan_chans = (struct trojanscan_inchannel *)tmalloc(count * sizeof(struct trojanscan_inchannel));
+  memset(trojanscan_chans, 0, count * sizeof(struct trojanscan_inchannel));
   trojanscan_activechans = count;
   i = 0;
     
@@ -1515,11 +1520,11 @@ void trojanscan_fill_channels(void *arg) {
       trojanscan_chans[i++].watch_clone = lp->watch_clone;
     }
     if (last)
-      free(last);
+      tfree(last);
   }
 
   if (last)
-    free(last);
+    tfree(last);
 
   if (trojanscan_activechans > 0) {
     tempctime = trojanscan_cycletime / trojanscan_activechans;
@@ -1569,7 +1574,7 @@ void trojanscan_dopart(void *arg) {
       } else {
         past->next = rp->next;
       }
-      free(rp);
+      tfree(rp);
       break;
     }
     past = rp;
@@ -1920,7 +1925,7 @@ void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args)
       /*
         trojanscan_mainchanmsg("k: %s on %s by %s", target->nick, ((channel *)args[1])->index->name->content, (((nick *)args[0])->nick)?(((nick *)args[0])->nick):"(server)");
       */
-        rj = (struct trojanscan_rejoinlist *)malloc(sizeof(struct trojanscan_rejoinlist));
+        rj = (struct trojanscan_rejoinlist *)tmalloc(sizeof(struct trojanscan_rejoinlist));
         if (rj) {
           rj->rp = NULL;
           for(rp=trojanscan_realchanlist;rp;rp=rp->next)
@@ -1930,14 +1935,14 @@ void trojanscan_clonehandlemessages(nick *target, int messagetype, void **args)
                 break;
               }
             if(!rj->rp) {
-              free(rj);
+              tfree(rj);
               return;
             }
 
             rj->channel = getsstring(((channel *)args[1])->index->name->content, ((channel *)args[1])->index->name->length);
             if(!rj->channel) {
               trojanscan_mainchanmsg("d: unable to allocate memory for channel: %s upon rejoin", ((channel *)args[1])->index->name->content);
-              free(rj);
+              tfree(rj);
               return;
             }
 
@@ -2086,12 +2091,12 @@ void trojanscan_rejoin_channel(void *arg) {
 
   if (rj2 == rj) {
     trojanscan_schedulerejoins = rj->next;
-    free(rj);
+    tfree(rj);
   } else {
     for(rj2=trojanscan_schedulerejoins;rj2;lrj=rj2,rj2=rj2->next) {
       if (rj2 == rj) {
         lrj->next = rj2->next;
-        free(rj);
+        tfree(rj);
         break;
       }
     }
@@ -2387,8 +2392,8 @@ void trojanscan_generatehost(char *buf, int maxsize, patricia_node_t **fakeip) {
   } else {
     char *cpos;
     int pieces = trojanscan_minmaxrand(2, 4), totallen = 0, a = 0, i;
-    int *choices = malloc(sizeof(int) * (pieces + 1));
-    int *lengths = malloc(sizeof(int) * (pieces + 1));
+    int *choices = tmalloc(sizeof(int) * (pieces + 1));
+    int *lengths = tmalloc(sizeof(int) * (pieces + 1));
   
     choices[pieces] = trojanscan_minmaxrand(0, trojanscan_tailpoolsize-1);
     lengths[pieces] = strlen(trojanscan_tailpool[choices[pieces]]->content) + 1;
@@ -2417,8 +2422,8 @@ void trojanscan_generatehost(char *buf, int maxsize, patricia_node_t **fakeip) {
     }
 
     buf[a] = '\0';
-    free(choices);
-    free(lengths);
+    tfree(choices);
+    tfree(lengths);
 
     memset(&ipaddress, 0, sizeof(ipaddress));
     ((unsigned short *)(ipaddress.in6_16))[5] = 65535;

diff --git a/trojanscan/trojanscan.h b/trojanscan/trojanscan.h
index a3ceae8305742a1b808e042088586141876b126e..3c21a8a4e227d325bb8cafb3af1e5af8ea9becd3 100644 (file)
--- a/trojanscan/trojanscan.h
+++ b/trojanscan/trojanscan.h
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <strings.h>
 
-#define TROJANSCAN_VERSION "2.70"
+#define TROJANSCAN_VERSION "2.71"
 
 #define TROJANSCAN_MAX_HOST_GLINE   5