Avoid release of store if there have been later allocations. Bug 2199

[exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index 8aa890bd00ad6afaf3a4532e554a45164f7b100b..d9b500102af6cad10275713fdbd4b34a5c22d22b 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1810,8 +1810,8 @@ for (;;)
   (and sometimes lunatic messages can have ones that are 100s of K long) we
   call store_release() for strings that have been copied - if the string is at
   the start of a block (and therefore the only thing in it, because we aren't
-  doing any other gets), the block gets freed. We can only do this because we
-  know there are no other calls to store_get() going on. */
+  doing any other gets), the block gets freed. We can only do this release if
+  there were no allocations since the once that we want to free. */
 
   if (ptr >= header_size - 4)
     {
@@ -1820,9 +1820,10 @@ for (;;)
     header_size *= 2;
     if (!store_extend(next->text, oldsize, header_size))
       {
+      BOOL release_ok = store_last_get[store_pool] == next->text;
       uschar *newtext = store_get(header_size);
       memcpy(newtext, next->text, ptr);
-      store_release(next->text);
+      if (release_ok) store_release(next->text);
       next->text = newtext;
       }
     }
@@ -3444,19 +3445,9 @@ else
 
            seen_items = string_catn(seen_items, ":", 1);
            }
-
          seen_items = string_cat(seen_items, item);
 
-         dkim_exim_acl_setup(item);
-         DEBUG(D_receive)
-           debug_printf("calling acl_smtp_dkim for dkim_cur_signer='%s'\n",
-             item);
-
-         rc = acl_check(ACL_WHERE_DKIM, NULL, acl_smtp_dkim,
-               &user_msg, &log_msg);
-         dkim_exim_verify_log_item();
-         results = string_append_listele(results, ':', dkim_verify_status);
-
+         rc = dkim_exim_acl_run(item, &results, &user_msg, &log_msg);
          if (rc != OK)
            {
            DEBUG(D_receive)