git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid creating before-buffer pointer. Bug 2145
[exim.git]
/
src
/
src
/
spam.c
diff --git
a/src/src/spam.c
b/src/src/spam.c
index d4b95b2f929e8235865821c5bbe7f7d89927b9f4..49776a30d66b0595559e3a0f37b24c23ce06006a 100644
(file)
--- a/
src/src/spam.c
+++ b/
src/src/spam.c
@@
-265,11
+265,9
@@
if (spam_ok && Ustrcmp(prev_user_name, user_name) == 0)
return override ? OK : spam_rc;
/* make sure the eml mbox file is spooled up */
return override ? OK : spam_rc;
/* make sure the eml mbox file is spooled up */
-mbox_file = spool_mbox(&mbox_size, NULL);
-if (mbox_file == NULL)
- {
- /* error while spooling */
+if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL)))
+ { /* error while spooling */
log_write(0, LOG_MAIN|LOG_PANIC,
"%s error while creating mbox spool file", loglabel);
return DEFER;
log_write(0, LOG_MAIN|LOG_PANIC,
"%s error while creating mbox spool file", loglabel);
return DEFER;
@@
-287,8
+285,7
@@
start = time(NULL);
/* Check how many spamd servers we have
and register their addresses */
sep = 0; /* default colon-sep */
/* Check how many spamd servers we have
and register their addresses */
sep = 0; /* default colon-sep */
- while ((address = string_nextinlist(&spamd_address_list_ptr, &sep,
- NULL, 0)) != NULL)
+ while ((address = string_nextinlist(&spamd_address_list_ptr, &sep, NULL, 0)))
{
const uschar * sublist;
int sublist_sep = -(int)' '; /* default space-sep */
{
const uschar * sublist;
int sublist_sep = -(int)' '; /* default space-sep */