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
OpenSSL: Fix memory leak during multi-message connections using STARTTLS
[exim.git]
/
src
/
src
/
queue.c
diff --git
a/src/src/queue.c
b/src/src/queue.c
index 8b0494b269a7593c6f97c74446665fe3890e26b0..99d7b464fe35c7e94f0bc87f42e9611cb7e69820 100644
(file)
--- a/
src/src/queue.c
+++ b/
src/src/queue.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
5
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions that operate on the input queue. */
@@
-80,7
+80,11
@@
queue_filename *first = NULL;
queue_filename **append = &first;
while (a && b)
queue_filename **append = &first;
while (a && b)
- if (Ustrcmp(a->text, b->text) < 0)
+ {
+ int d;
+ if ((d = Ustrncmp(a->text, b->text, 6)) == 0)
+ d = Ustrcmp(a->text + 14, b->text + 14);
+ if (d < 0)
{
*append = a;
append= &a->next;
{
*append = a;
append= &a->next;
@@
-92,6
+96,7
@@
while (a && b)
append= &b->next;
b = b->next;
}
append= &b->next;
b = b->next;
}
+ }
*append = a ? a : b;
return first;
*append = a ? a : b;
return first;
@@
-278,7
+283,7
@@
for (; i <= *subcount; i++)
if (root[j])
{
next = merge_queue_lists(next, root[j]);
if (root[j])
{
next = merge_queue_lists(next, root[j]);
- root[j] =
(j == LOG2_MAXNODES - 1)
? next : NULL;
+ root[j] =
j == LOG2_MAXNODES - 1
? next : NULL;
}
else
{
}
else
{
@@
-450,8
+455,8
@@
subsequent iterations.
When the first argument of queue_get_spool_list() is -1 (for queue_run_in_
order), it scans all directories and makes a single message list. */
When the first argument of queue_get_spool_list() is -1 (for queue_run_in_
order), it scans all directories and makes a single message list. */
-for (i
= (queue_run_in_order? -1 : 0)
;
- i <= (queue_run_in_order? -1 : subcount);
+for (i
= queue_run_in_order ? -1 : 0
;
+ i <= (queue_run_in_order
? -1 : subcount);
i++)
{
queue_filename *f;
i++)
{
queue_filename *f;
@@
-694,6
+699,7
@@
for (i = (queue_run_in_order? -1 : 0);
}
} /* End loop for list of messages */
}
} /* End loop for list of messages */
+ tree_nonrecipients = NULL;
store_reset(reset_point1); /* Scavenge list of messages */
/* If this was the first time through for random order processing, and
store_reset(reset_point1); /* Scavenge list of messages */
/* If this was the first time through for random order processing, and