X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=c86c1b0baafabd189f47bcbd1f6815020d9cb702;hb=8a3a9962ecc5faf81e0f5c3e18726545bf198249;hp=131b371acf52d0600e99c838b7376bb051365b40;hpb=dac9b3ef6f31553f5cae283aaaa7418b8e2bc1e2;p=citadel.git

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index 131b371ac..c86c1b0ba 100644
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -508,9 +508,9 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	size_t headers_len = 0;
 	int len = 0;
 
-	if (userdata == NULL)
+	if (u == NULL)
 	{
-		CtdlLogPrintf(CTDL_EMERG, "Cant process Message <%ld>without Userdata!\n", msgnum);
+		CtdlLogPrintf(CTDL_EMERG, "Can't process message <%ld> without userdata!\n", msgnum);
 		return;
 	}
 
@@ -535,6 +535,12 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	CC->redirect_len = 0;
 	CC->redirect_alloc = 0;
 
+	if (u == NULL)
+	{
+		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
+		abort();
+	}
+
 	/*
 	 * libSieve clobbers the stack if it encounters badly formed
 	 * headers.  Sanitize our headers by stripping nonprintable
@@ -627,14 +633,35 @@ void sieve_do_msg(long msgnum, void *userdata) {
 
 	CtdlFreeMessage(msg);
 
+	if (u == NULL)
+	{
+		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
+		abort();
+	}
+
+
+	CtdlLogPrintf(CTDL_DEBUG, "HEADERS-------\n%s\n", my.rfc822headers);
+
 	sieve2_setvalue_string(sieve2_context, "allheaders", my.rfc822headers);
 	
+	if (u == NULL)
+	{
+		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
+		abort();
+	}
+
 	CtdlLogPrintf(CTDL_DEBUG, "Calling sieve2_execute()\n");
 	res = sieve2_execute(sieve2_context, &my);
 	if (res != SIEVE2_OK) {
 		CtdlLogPrintf(CTDL_CRIT, "sieve2_execute() returned %d: %s\n", res, sieve2_errstr(res));
 	}
 
+	if (u == NULL)
+	{
+		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
+		abort();
+	}
+
 	free(my.rfc822headers);
 	my.rfc822headers = NULL;
 
@@ -647,6 +674,12 @@ void sieve_do_msg(long msgnum, void *userdata) {
 		CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 	}
 
+	if (u == NULL)
+	{
+		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
+		abort();
+	}
+
 	CtdlLogPrintf(CTDL_DEBUG, "Completed sieve processing on msg <%ld>\n", msgnum);
 	u->lastproc = msgnum;