*/
+#ifndef SMARTALLOC_H
+#define SMARTALLOC_H
+
extern uint64_t DLL_IMP_EXP sm_max_bytes;
extern uint64_t DLL_IMP_EXP sm_bytes;
extern uint32_t DLL_IMP_EXP sm_max_buffers;
#define sm_dump(x)
#define sm_static(x)
#define sm_new_owner(a, b, c)
-#define sm_malloc(f, l, n) malloc(n)
-
+#define sm_malloc(f, l, n) malloc(n)
+#define sm_free(f, l, n) free(n)
#define sm_check(f, l, fl)
#define sm_check_rtn(f, l, fl) 1
#define New(type) new(__FILE__, __LINE__) type
+/* We do memset(0) because it's not possible to memset a class when
+ * using subclass with virtual functions
+ */
+
class SMARTALLOC
{
public:
void *operator new(size_t s, const char *fname, int line)
{
- void *p = sm_malloc(fname, line, s > sizeof(int) ? (unsigned int)s : sizeof(int));
- return p;
+ size_t size = s > sizeof(int) ? (unsigned int)s : sizeof(int);
+ void *p = sm_malloc(fname, line, size);
+ memset(p, 0, size);
+ return p;
}
void *operator new[](size_t s, const char *fname, int line)
{
- void *p = sm_malloc(fname, line, s > sizeof(int) ? (unsigned int)s : sizeof(int));
+ size_t size = s > sizeof(int) ? (unsigned int)s : sizeof(int);
+ void *p = sm_malloc(fname, line, size);
+ memset(p, 0, size);
return p;
}
+
void operator delete(void *ptr)
{
free(ptr);
{
free(ptr);
}
-void operator delete[](void *ptr, size_t /*i*/, const char * /*fname*/, int /*line*/)
+void operator delete[](void *ptr, size_t /*i*/,
+ const char * /*fname*/, int /*line*/)
{
free(ptr);
}
-
private:
void *operator new(size_t s) throw() { (void)s; return 0; }
void *operator new[](size_t s) throw() { (void)s; return 0; }
};
-
#else
#define New(type) new type
{
public:
void *operator new(size_t s) {
- return malloc(s);
+ void *p = malloc(s);
+ memset(p, 0, s);
+ return p;
}
void *operator new[](size_t s) {
- return malloc(s);
+ void *p = malloc(s);
+ memset(p, 0, s);
+ return p;
}
void operator delete(void *ptr) {
free(ptr);
free(ptr);
}
};
-#endif
+#endif /* SMARTALLOC */
+
+#endif /* !SMARTALLOC_H */