Merge.

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index 309b50d3103766fa47e4fc7ae3fd230b041ab804..9337e4011e977456c7ed660d6a85d2fca7604422 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -1419,7 +1419,7 @@ void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count)
   struct trojanscan_templist *markedlist = NULL;
 
   if(count > 0) {
-    markedlist = (struct trojanscan_templist *)malloc(count * sizeof(struct trojanscan_templist));
+    markedlist = (struct trojanscan_templist *)tmalloc(count * sizeof(struct trojanscan_templist));
     if (!markedlist)
       return;
     memset(markedlist, 0, sizeof(struct trojanscan_templist) * count);