X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=puttymem.h;h=6ef3f794931a326feb358a3fb1f80ff4c8401e97;hb=a46aac386b20e6474d45f701a96d7afc8cfdafec;hp=4396592ffb5fc94c883917b87c9363789ae2965d;hpb=ea2e1dd9ae844c96f62ccf3852927ba040fddcbf;p=PuTTY.git

diff --git a/puttymem.h b/puttymem.h
index 4396592f..6ef3f794 100644
--- a/puttymem.h
+++ b/puttymem.h
@@ -5,33 +5,39 @@
 #ifndef PUTTY_PUTTYMEM_H
 #define PUTTY_PUTTYMEM_H
 
-#include <stddef.h> /* for size_t */
-#include <string.h> /* for memcpy() */
+#include <stddef.h>		       /* for size_t */
+#include <string.h>		       /* for memcpy() */
 
 
 /* #define MALLOC_LOG  do this if you suspect putty of leaking memory */
 #ifdef MALLOC_LOG
-#define smalloc(z) (mlog(__FILE__,__LINE__), safemalloc(z))
-#define srealloc(y,z) (mlog(__FILE__,__LINE__), saferealloc(y,z))
+#define smalloc(z) (mlog(__FILE__,__LINE__), safemalloc(z,1))
+#define snmalloc(z,s) (mlog(__FILE__,__LINE__), safemalloc(z,s))
+#define srealloc(y,z) (mlog(__FILE__,__LINE__), saferealloc(y,z,1))
+#define snrealloc(y,z,s) (mlog(__FILE__,__LINE__), saferealloc(y,z,s))
 #define sfree(z) (mlog(__FILE__,__LINE__), safefree(z))
 void mlog(char *, int);
 #else
-#define smalloc safemalloc
-#define srealloc saferealloc
+#define smalloc(z) safemalloc(z,1)
+#define snmalloc safemalloc
+#define srealloc(y,z) saferealloc(y,z,1)
+#define snrealloc saferealloc
 #define sfree safefree
 #endif
 
-void *safemalloc(size_t);
-void *saferealloc(void *, size_t);
+void *safemalloc(size_t, size_t);
+void *saferealloc(void *, size_t, size_t);
 void safefree(void *);
 
-
-/* smalloc a thing */
-#define smalloca(type) ((type *) smalloc (sizeof (type)))
-/* smalloc a copy of a thing */
-#define smallocc(ptr) memcpy (smalloc (sizeof (*ptr)), ptr, sizeof (*ptr))
-/* smalloc n things */
-#define smallocn(n,type) ((type *) smalloc ((n) * sizeof (type)))
-
+/*
+ * Direct use of smalloc within the code should be avoided where
+ * possible, in favour of these type-casting macros which ensure
+ * you don't mistakenly allocate enough space for one sort of
+ * structure and assign it to a different sort of pointer.
+ */
+#define snew(type) ((type *)snmalloc(1, sizeof(type)))
+#define snewn(n, type) ((type *)snmalloc((n), sizeof(type)))
+#define sresize(ptr, n, type) \
+    ((type *)snrealloc((sizeof((type *)0 == (ptr)), (ptr)), (n), sizeof(type)))
 
 #endif