X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=puttymem.h;h=6ef3f794931a326feb358a3fb1f80ff4c8401e97;hb=c10a8dee07fc10cbe9295e1a088b15b6e357f774;hp=b529c985d12f6fcb7f4a24ee14240f458b5347ee;hpb=893d187b81991a7b259ede864b7d18ae60c59589;p=PuTTY.git diff --git a/puttymem.h b/puttymem.h index b529c985..6ef3f794 100644 --- a/puttymem.h +++ b/puttymem.h @@ -14,7 +14,7 @@ #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) (mlog(__FILE__,__LINE__), saferealloc(y,z,s)) +#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 @@ -37,6 +37,7 @@ void safefree(void *); */ #define snew(type) ((type *)snmalloc(1, sizeof(type))) #define snewn(n, type) ((type *)snmalloc((n), sizeof(type))) -#define sresize(ptr, n, type) ((type *)snrealloc((ptr), (n), sizeof(type))) +#define sresize(ptr, n, type) \ + ((type *)snrealloc((sizeof((type *)0 == (ptr)), (ptr)), (n), sizeof(type))) #endif