--- deliantra/server/common/shstr.C	2009/01/01 16:05:12	1.37
+++ deliantra/server/common/shstr.C	2009/01/01 21:15:12	1.38
@@ -41,14 +41,16 @@
 makevec (const char *s)
 {
   int len = strlen (s);
+  int alloc = sizeof (uint32_t) * 2 + len + 1;
 
-  shstr_alloc += sizeof (uint32_t) * 2 + len + 1;
-  const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (uint32_t) * 2 + len + 1));
+  shstr_alloc += alloc;
+  char *v = (char *)g_slice_alloc (alloc);
+  v += sizeof (uint32_t) * 2;
 
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
 
-  memcpy ((char *) v, s, len + 1);
+  memcpy (v, s, len + 1);
 
   return v;
 }
@@ -119,8 +121,9 @@
           ht.erase (o);
 
           //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
-          shstr_alloc -= sizeof (uint32_t) * 2 + length (s) + 1;
-          g_slice_free1 (sizeof (uint32_t) * 2 + length (s) + 1, -2 + (int *) s);
+          int alloc = sizeof (uint32_t) * 2 + length (s) + 1;
+          shstr_alloc -= alloc;
+          g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2));
         }
       else
         ++i;