From 5e4d4deecaecafa0f858e26b0ae7c6027c49f69d Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Fri, 13 Nov 1998 17:26:44 +0000 Subject: ZERO_STRUCTP does not check argument for NULL. ZERO_STRUCTPN _does_ check argument for NULL. (This used to be commit 0be34ca1402f95506680caa3461e94d4ae54bb7d) --- source3/include/smb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/include/smb.h') diff --git a/source3/include/smb.h b/source3/include/smb.h index bb055214ec..acbd56d81e 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1655,7 +1655,10 @@ extern int unix_ERR_code; #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) /* zero a structure given a pointer to the structure */ -#define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } +#define ZERO_STRUCTP(x) memset((char *)(x), 0, sizeof(*(x)) + +/* zero a structure given a pointer to the structure */ +#define ZERO_STRUCTPN(x) { if ((x) != NULL) ZERO_STRUCTP(x); } /* zero an array - note that sizeof(array) must work - ie. it must not be a pointer */ -- cgit