From: Wilfried Göesgens <willi@citadel.org>
Date: Tue, 19 Jun 2007 21:32:00 +0000 (+0000)
Subject: * fix a leak in GREG
X-Git-Tag: v7.86~3293
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=fae51f3f1f53890b1178b05183d670d8eba45719

* fix a leak in GREG
* fix some unclear conditions mentioned by valgrind.
---

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index c3ec9fd07..e6ae83f70 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -103,6 +103,10 @@ void LogPrintMessages(long err)
 	snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
 
 	quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
+	if (errormessages!=NULL) free (errormessages);
+	errormessages = NULL;
+	if (portlist!=NULL) free (portlist);
+	portlist = NULL;
 	free(Message);
 }
 
@@ -247,6 +251,8 @@ void initialize_server_extensions(void)
 {
 	long filter;
 
+	nSizErrmsg = 0;
+
 	lprintf(CTDL_INFO, "%s\n", serv_bio_init());
 	lprintf(CTDL_INFO, "%s\n", serv_calendar_init());
 	lprintf(CTDL_INFO, "%s\n", serv_notes_init());
diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 4e639e673..fe20b40af 100644
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -766,6 +766,7 @@ void cmd_greg(char *argbuf)
 	extract_token(buf, adr, 6, ';', sizeof buf);
 	cprintf("%s\n", buf);				/* country */
 	cprintf("000\n");
+	vcard_free(v);
 }