--- deliantra/server/include/util.h	2008/04/20 05:24:55	1.70
+++ deliantra/server/include/util.h	2008/05/03 11:14:50	1.73
@@ -22,7 +22,7 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
-#define DEBUG_POISON 0xaa // poison memory before freeing it if != 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
 
@@ -226,6 +226,14 @@
     }
 }
 
+// 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
 {
@@ -246,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);
   }