--- deliantra/server/include/util.h	2008/04/18 23:43:59	1.69
+++ deliantra/server/include/util.h	2008/05/03 11:14:50	1.73
@@ -22,8 +22,9 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
-#define DEBUG_SALLOC 0
-#define PREFER_MALLOC 0
+#define DEBUG_POISON 0x00 // poison memory before freeing it if != 0
+#define DEBUG_SALLOC  0   // add a debug wrapper around all sallocs
+#define PREFER_MALLOC 0   // use malloc and not the slice allocator
 
 #if __GNUC__ >= 3
 # define is_constant(c)             __builtin_constant_p (c)
@@ -219,11 +220,20 @@
   if (expect_true (ptr))
     {
       slice_alloc -= n * sizeof (T);
+      if (DEBUG_POISON) memset (ptr, DEBUG_POISON, n * sizeof (T));
       g_slice_free1 (n * sizeof (T), (void *)ptr);
       assert (slice_alloc >= 0);//D
     }
 }
 
+// nulls the pointer
+template<typename T>
+inline void sfree0 (T *&ptr, int n = 1) throw ()
+{
+  sfree<T> (ptr, n);
+  ptr = 0;
+}
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -244,6 +254,35 @@
   }
 
   void operator delete (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+
+  void operator delete[] (void *p, size_t s)
+  {
+    sfree ((char *)p, s);
+  }
+};
+
+// makes dynamically allocated objects zero-initialised
+struct slice_allocated
+{
+  void *operator new (size_t s, void *p)
+  {
+    return p;
+  }
+
+  void *operator new (size_t s)
+  {
+    return salloc<char> (s);
+  }
+
+  void *operator new[] (size_t s)
+  {
+    return salloc<char> (s);
+  }
+
+  void operator delete (void *p, size_t s)
   {
     sfree ((char *)p, s);
   }