ZEND_SECURE_ZERO

Author: szabolcsbalogh

php7/memcache_ascii_protocol.c

@@ -206,7 +206,7 @@ static int mmc_server_read_value(mmc_t *mmc, mmc_request_t *request) /*
 static mmc_request_t *mmc_ascii_create_request() /* {{{ */ 
 {
 	mmc_ascii_request_t *request = emalloc(sizeof(mmc_ascii_request_t));
-	memset(request, 0, sizeof(*request));
+	ZEND_SECURE_ZERO(request, sizeof(*request));
 	return (mmc_request_t *)request;
 }
 /* }}} */
@@ -265,7 +265,7 @@ static int mmc_ascii_store(
 	mmc_buffer_t buffer;
 	request->parse = mmc_request_parse_response;
 
-	memset(&buffer, 0, sizeof(buffer));
+	ZEND_SECURE_ZERO(&buffer, sizeof(buffer));
 	status = mmc_pack_value(pool, &buffer, value, &flags);
 
 	if (status != MMC_OK) {

php7/memcache_binary_protocol.c

@@ -436,7 +436,7 @@ static inline void mmc_pack_header(mmc_request_header_t *header, uint8_t opcode,
 static mmc_request_t *mmc_binary_create_request() /* {{{ */
 {
 	mmc_binary_request_t *request = emalloc(sizeof(mmc_binary_request_t));
-	memset(request, 0, sizeof(mmc_binary_request_t));
+	ZEND_SECURE_ZERO(request, sizeof(mmc_binary_request_t));
 	return (mmc_request_t *)request;
 }
 /* }}} */

php7/memcache_consistent_hash.c

@@ -47,7 +47,7 @@ typedef struct mmc_consistent_state {
 void *mmc_consistent_create_state(mmc_hash_function_t *hash) /* {{{ */
 {
 	mmc_consistent_state_t *state = emalloc(sizeof(mmc_consistent_state_t));
-	memset(state, 0, sizeof(mmc_consistent_state_t));
+	ZEND_SECURE_ZERO(state, sizeof(mmc_consistent_state_t));
 	state->hash = hash;
 	return state;
 }

php7/memcache_pool.c

@@ -54,7 +54,7 @@ MMC_POOL_INLINE void mmc_buffer_free(mmc_buffer_t *buffer)  /* {{{ */
 	if (buffer->value.c != NULL) {
 		smart_string_free(&(buffer->value));
 	}
-	memset(buffer, 0, sizeof(*buffer));
+	ZEND_SECURE_ZERO(buffer, sizeof(*buffer));
 }
 /* }}} */
 
@@ -297,7 +297,7 @@ static void mmc_compress(mmc_pool_t *pool, mmc_buffer_t *buffer, const char *val
 			prev = *buffer;
 
 			/* allocate space for prev header + result */
-			memset(buffer, 0, sizeof(*buffer));
+			ZEND_SECURE_ZERO(buffer, sizeof(*buffer));
 			mmc_buffer_alloc(buffer, prev.value.len + result_len);
 
 			/* append prev header */
@@ -543,7 +543,7 @@ mmc_t *mmc_server_new(
 	int persistent, double timeout, int retry_interval) /* {{{ */
 {
 	mmc_t *mmc = pemalloc(sizeof(mmc_t), persistent);
-	memset(mmc, 0, sizeof(*mmc));
+	ZEND_SECURE_ZERO(mmc, sizeof(*mmc));
 
 	mmc->host = pemalloc(host_len + 1, persistent);
 	memcpy(mmc->host, host, host_len);
@@ -851,7 +851,7 @@ static void mmc_pool_init_hash(mmc_pool_t *pool) /* {{{ */
 mmc_pool_t *mmc_pool_new() /* {{{ */
 {
 	mmc_pool_t *pool = emalloc(sizeof(mmc_pool_t));
-	memset(pool, 0, sizeof(*pool));
+	ZEND_SECURE_ZERO(pool, sizeof(*pool));
 
 	switch (MEMCACHE_G(protocol)) {
 		case MMC_BINARY_PROTOCOL:

php7/memcache_pool.h

@@ -124,7 +124,7 @@ typedef struct mmc_buffer {
 	unsigned int	idx;					/* current index */
 } mmc_buffer_t;
 
-#define mmc_buffer_release(b) memset((b), 0, sizeof(*(b)))
+#define mmc_buffer_release(b) ZEND_SECURE_ZERO((b), sizeof(*(b)))
 #define mmc_buffer_reset(b) (b)->value.len = (b)->idx = 0
 
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L

php7/memcache_queue.c

@@ -91,7 +91,7 @@ MMC_QUEUE_INLINE void mmc_queue_free(mmc_queue_t *queue) {
 	if (queue->items != NULL) {
 		efree(queue->items);
 	}
-	memset(queue, 0, sizeof(*queue));
+	ZEND_SECURE_ZERO(queue, sizeof(*queue));
 }
 
 MMC_QUEUE_INLINE void mmc_queue_copy(mmc_queue_t *target, mmc_queue_t *source) {

php7/memcache_queue.h

@@ -33,7 +33,7 @@ typedef struct mmc_queue {
 	int		len;
 } mmc_queue_t;
 
-#define mmc_queue_release(q) memset((q), 0, sizeof(*(q)))
+#define mmc_queue_release(q) ZEND_SECURE_ZERO((q), sizeof(*(q)))
 #define mmc_queue_reset(q) (q)->len = (q)->head = (q)->tail = 0
 #define mmc_queue_item(q, i) ((q)->tail + (i) < (q)->alloc ? (q)->items[(q)->tail + (i)] : (q)->items[(i) - ((q)->alloc - (q)->tail)]) 
 

php7/memcache_standard_hash.c

@@ -38,7 +38,7 @@ typedef struct mmc_standard_state {
 void *mmc_standard_create_state(mmc_hash_function_t *hash) /* {{{ */
 {
 	mmc_standard_state_t *state = emalloc(sizeof(mmc_standard_state_t));
-	memset(state, 0, sizeof(mmc_standard_state_t));
+	ZEND_SECURE_ZERO(state, sizeof(mmc_standard_state_t));
 	state->hash = hash;
 	return state;
 }