From 5d84654fe44fba4f53dc2db92f1d675e23f516ad Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Mon, 3 Sep 2007 18:40:56 +0000
Subject: [PATCH] Stop avirus being crashy

---
 src/agents/avirus/avirus.c | 50 ++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/agents/avirus/avirus.c b/src/agents/avirus/avirus.c
index 7425232..0731a58 100755
--- a/src/agents/avirus/avirus.c
+++ b/src/agents/avirus/avirus.c
@@ -555,17 +555,17 @@ ProcessConnection(AVClient *client)
     }
 
     if (AVirus.flags & AV_FLAG_NOTIFY_USER) {
-	users = MemMalloc0(sizeof(BongoSList));
-	if (!users) {
-	    MemFree(client->envelope);
-	    client->envelope = NULL;
-	    
-	    NMAPSendCommand(client->conn, "QDONE\r\n", 7);
-	    NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
-	    return(-1);
-	}
+        users = MemMalloc0(sizeof(BongoSList));
+        if (!users) {
+            MemFree(client->envelope);
+            client->envelope = NULL;
+            
+            NMAPSendCommand(client->conn, "QDONE\r\n", 7);
+            NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
+            return(-1);
+        }
     } else {
-	users = NULL;
+        users = NULL;
     }
 
     preserve = '\0';
@@ -573,16 +573,16 @@ ProcessConnection(AVClient *client)
     if (AVirus.flags & AV_FLAG_SCAN_INCOMING) {
         XplSafeIncrement(AVirus.stats.messages.scanned);
 
-	ccode = ScanMessage(client, qID);
-	
-	if (ccode == -1) {
-	    MemFree(client->envelope);
-	    client->envelope = NULL;
-	    
-	    NMAPSendCommand(client->conn, "QDONE\r\n", 7);
-	    NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
-	    return(-1);
-	}
+        ccode = ScanMessage(client, qID);
+        
+        if (ccode == -1) {
+            MemFree(client->envelope);
+            client->envelope = NULL;
+            
+            NMAPSendCommand(client->conn, "QDONE\r\n", 7);
+            NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
+            return(-1);
+        }
 
         infected = (ccode > 0);
 
@@ -921,14 +921,16 @@ ProcessConnection(AVClient *client)
         ccode = NMAPReadAnswer(client->conn, client->line, CONN_BUFSIZE, FALSE);
     }
 
-    if (AVirus.flags & AV_FLAG_NOTIFY_USER) {
+    if ((AVirus.flags & AV_FLAG_NOTIFY_USER) && users) {
         BongoSList *userlist;
         for (userlist = users; userlist != NULL; userlist = userlist->next) {
             AVRecipient *recip;
             recip = (AVRecipient *)userlist->data;
-            MemFree(recip->name);
-            MemFree(recip->address);
-            MemFree(recip);
+            if (recip){
+                MemFree(recip->name);
+                MemFree(recip->address);
+                MemFree(recip);
+            }
             userlist->data = NULL;
         }
         BongoSListFree(users);