// LordHavoc: this is pointless with a good C library
//#define MEMCLUMPING
-#define POOLNAMESIZE 128
-// if set this pool will be printed in memlist reports
-#define POOLFLAG_TEMP 1
+// div0: heap overflow detection paranoia
+//#define MEMPARANOIA 1
+
#if MEMCLUMPING
-// give malloc padding so we can't waste most of a page at the end
-#define MEMCLUMPSIZE (65536 - 1536)
// smallest unit we care about is this many bytes
-#define MEMUNIT 8
+#define MEMUNIT 64
+#define MEMUNITSPERINT (MEMUNIT*32)
+#define MEMUNITSPERBYTE (MEMUNIT*8)
+// 1MB clumps
+#define MEMWANTCLUMPSIZE 1048576
+// give malloc padding so we can't waste most of a page at the end
+#define MEMCLUMPSIZE (MEMWANTCLUMPSIZE - MEMWANTCLUMPSIZE/MEMUNITSPERBYTE - 128)
#define MEMBITS (MEMCLUMPSIZE / MEMUNIT)
#define MEMBITINTS (MEMBITS / 32)
-#define MEMCLUMP_SENTINEL 0xABADCAFE
#endif
-#define MEMHEADER_SENTINEL1 0xDEADF00D
-#define MEMHEADER_SENTINEL2 0xDF
+#define POOLNAMESIZE 128
+// if set this pool will be printed in memlist reports
+#define POOLFLAG_TEMP 1
typedef struct memheader_s
{