Minor doc nits re bug 1262.

[users/jgh/exim.git] / src / src / store.c

diff --git a/src/src/store.c b/src/src/store.c
index 738c4f6a6e432feea5c70daeb50a7902ed869be9..790f79ddbca7d7883ac0ef493b5717a47cd00824 100644 (file)
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/store.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2012 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Exim gets and frees all its store through these functions. In the original
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Exim gets and frees all its store through these functions. In the original


@@ -41,6 +39,10 @@ The following different types of store are recognized:
 
 
 #include "exim.h"
 
 
 #include "exim.h"

+/* keep config.h before memcheck.h, for NVALGRIND */
+#include "config.h"
+
+#include "memcheck.h"

 
 
 /* We need to know how to align blocks of data for general use. I'm not sure
 
 
 /* We need to know how to align blocks of data for general use. I'm not sure


@@ -175,6 +177,7 @@ if (size > yield_length[store_pool])
   yield_length[store_pool] = newblock->length;
   next_yield[store_pool] =
     (void *)((char *)current_block[store_pool] + ALIGNED_SIZEOF_STOREBLOCK);
   yield_length[store_pool] = newblock->length;
   next_yield[store_pool] =
     (void *)((char *)current_block[store_pool] + ALIGNED_SIZEOF_STOREBLOCK);

+  VALGRIND_MAKE_MEM_NOACCESS(next_yield[store_pool], yield_length[store_pool]);

   }
 
 /* There's (now) enough room in the current block; the yield is the next
   }
 
 /* There's (now) enough room in the current block; the yield is the next


@@ -199,6 +202,7 @@ DEBUG(D_memory)
   }
 #endif  /* COMPILE_UTILITY */
 
   }
 #endif  /* COMPILE_UTILITY */
 

+VALGRIND_MAKE_MEM_UNDEFINED(store_last_get[store_pool], size);

 /* Update next pointer and number of bytes left in the current block. */
 
 next_yield[store_pool] = (void *)((char *)next_yield[store_pool] + size);
 /* Update next pointer and number of bytes left in the current block. */
 
 next_yield[store_pool] = (void *)((char *)next_yield[store_pool] + size);


@@ -293,6 +297,7 @@ DEBUG(D_memory)
 if (newsize % alignment != 0) newsize += alignment - (newsize % alignment);
 next_yield[store_pool] = (char *)ptr + newsize;
 yield_length[store_pool] -= newsize - rounded_oldsize;
 if (newsize % alignment != 0) newsize += alignment - (newsize % alignment);
 next_yield[store_pool] = (char *)ptr + newsize;
 yield_length[store_pool] -= newsize - rounded_oldsize;

+VALGRIND_MAKE_MEM_UNDEFINED(ptr + oldsize, inc);

 return TRUE;
 }
 
 return TRUE;
 }
 


@@ -340,7 +345,7 @@ if ((char *)ptr < bc || (char *)ptr > bc + b->length)
     if ((char *)ptr >= bc && (char *)ptr <= bc + b->length) break;
     }
   if (b == NULL)
     if ((char *)ptr >= bc && (char *)ptr <= bc + b->length) break;
     }
   if (b == NULL)

-    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "internal error: store_reset(%d) "
+    log_write(0, LOG_MAIN|LOG_PANIC_DIE, "internal error: store_reset(%p) "

       "failed: pool=%d %-14s %4d", ptr, store_pool, filename, linenumber);
   }
 
       "failed: pool=%d %-14s %4d", ptr, store_pool, filename, linenumber);
   }
 


@@ -351,6 +356,7 @@ newlength = bc + b->length - (char *)ptr;
 #ifndef COMPILE_UTILITY
 if (running_in_test_harness) memset(ptr, 0xF0, newlength);
 #endif
 #ifndef COMPILE_UTILITY
 if (running_in_test_harness) memset(ptr, 0xF0, newlength);
 #endif

+VALGRIND_MAKE_MEM_NOACCESS(ptr, newlength);

 yield_length[store_pool] = newlength - (newlength % alignment);
 next_yield[store_pool] = (char *)ptr + (newlength % alignment);
 current_block[store_pool] = b;
 yield_length[store_pool] = newlength - (newlength % alignment);
 next_yield[store_pool] = (char *)ptr + (newlength % alignment);
 current_block[store_pool] = b;


@@ -362,7 +368,10 @@ flapping memory. However, keep this block only when it has the default size. */
 if (yield_length[store_pool] < STOREPOOL_MIN_SIZE &&
     b->next != NULL &&
     b->next->length == STORE_BLOCK_SIZE)
 if (yield_length[store_pool] < STOREPOOL_MIN_SIZE &&
     b->next != NULL &&
     b->next->length == STORE_BLOCK_SIZE)

+  {

   b = b->next;
   b = b->next;

+  VALGRIND_MAKE_MEM_NOACCESS((char *)b + ALIGNED_SIZEOF_STOREBLOCK, b->length - ALIGNED_SIZEOF_STOREBLOCK);
+  }

 
 bb = b->next;
 b->next = NULL;
 
 bb = b->next;
 b->next = NULL;