dovecot-2.2-pigeonhole: ManageSieve: fixed segfault bug triggere...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Fri Jul 13 11:06:55 EEST 2012
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/6ceeb6421231
changeset: 1635:6ceeb6421231
user: Stephan Bosch <stephan at rename-it.nl>
date: Thu Jul 12 23:57:50 2012 +0200
description:
ManageSieve: fixed segfault bug triggered by CHECKSCRIPT command.
diffstat:
src/lib-sievestorage/sieve-storage-save.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diffs (30 lines):
diff -r 602d93069d3a -r 6ceeb6421231 src/lib-sievestorage/sieve-storage-save.c
--- a/src/lib-sievestorage/sieve-storage-save.c Sat May 26 00:16:35 2012 +0200
+++ b/src/lib-sievestorage/sieve-storage-save.c Thu Jul 12 23:57:50 2012 +0200
@@ -318,19 +318,20 @@
bool sieve_storage_save_will_activate
(struct sieve_save_context *ctx)
{
- const char *scriptname;
- int ret = 0;
+ bool result = FALSE;
- T_BEGIN {
+ if ( ctx->scriptname != NULL ) T_BEGIN {
+ const char *scriptname;
+ int ret;
+
ret = sieve_storage_get_active_scriptfile(ctx->storage, &scriptname);
-
if ( ret > 0 ) {
/* Is the requested script active? */
- ret = ( strcmp(ctx->scriptname, scriptname) == 0 ? 1 : 0 );
+ result = ( strcmp(ctx->scriptname, scriptname) == 0 );
}
} T_END;
- return ret;
+ return result;
}
int sieve_storage_save_commit(struct sieve_save_context **ctx)
More information about the dovecot-cvs
mailing list