From 4e27a1275a060cb7db864a25bede84e379b11cce Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 7 Apr 2016 16:54:13 +0200
Subject: [PATCH] Fix segfault bug caused by earlier trace log changes.
Trace_log variable was not initialized.
---
src/plugins/imapsieve/imap-sieve.c | 5 ++---
src/plugins/lda-sieve/lda-sieve-plugin.c | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/plugins/imapsieve/imap-sieve.c b/src/plugins/imapsieve/imap-sieve.c
index 19eac4493..f1b410625 100644
--- a/src/plugins/imapsieve/imap-sieve.c
+++ b/src/plugins/imapsieve/imap-sieve.c
@@ -695,14 +695,13 @@ int imap_sieve_run_mail
/* Initialize trace logging */
+ trace_log = NULL;
if ( sieve_trace_config_get(svinst, &trace_config) >= 0) {
const char *tr_label = t_strdup_printf
("%s.%s.%u", isieve->user->username,
mailbox_get_vname(isrun->mailbox), mail->uid);
- if ( sieve_trace_log_open(svinst, tr_label, &trace_log) < 0 ) {
+ if ( sieve_trace_log_open(svinst, tr_label, &trace_log) < 0 )
memset(&trace_config, 0, sizeof(trace_config));
- trace_log = NULL;
- }
}
T_BEGIN {
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c
index bb5b0d703..2effe5852 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c
@@ -807,11 +807,10 @@ static int lda_sieve_execute
/* Initialize trace logging */
+ trace_log = NULL;
if ( sieve_trace_config_get(svinst, &trace_config) >= 0 &&
- sieve_trace_log_open(svinst, NULL, &trace_log) < 0 ) {
+ sieve_trace_log_open(svinst, NULL, &trace_log) < 0 )
memset(&trace_config, 0, sizeof(trace_config));
- trace_log = NULL;
- }
/* Collect necessary message data */
--
GitLab