From: Andrey Hristov <andrey@php.net>
Date: Tue, 6 Apr 2010 14:33:55 +0000 (+0000)
Subject: Stricly C
X-Git-Tag: php-5.4.0alpha1~191^2~1799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cb852fe6be0f79af7b1a84ac15406166388317c;p=php

Stricly C
---

diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index d80ddc246c..0254528889 100644
--- a/ext/mysqlnd/mysqlnd_debug.c
+++ b/ext/mysqlnd/mysqlnd_debug.c
@@ -696,9 +696,9 @@ void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D)
 	DBG_INF_FMT("size=%lu ptr=%p persistent=%d", size, ret, persistent);
 
 	if (collect_memory_statistics) {
-		*(size_t *) ret = size;
 		enum mysqlnd_collected_stats s1 = persistent? STAT_MEM_MALLOC_COUNT:STAT_MEM_EMALLOC_COUNT;
 		enum mysqlnd_collected_stats s2 = persistent? STAT_MEM_MALLOC_AMOUNT:STAT_MEM_EMALLOC_AMOUNT;
+		*(size_t *) ret = size;
 		MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, size);
 	}
 
@@ -741,9 +741,9 @@ void * _mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent M
 	DBG_INF_FMT("size=%lu ptr=%p", size, ret); 
 
 	if (collect_memory_statistics) {
-		*(size_t *) ret = size;
 		enum mysqlnd_collected_stats s1 = persistent? STAT_MEM_CALLOC_COUNT:STAT_MEM_ECALLOC_COUNT;
 		enum mysqlnd_collected_stats s2 = persistent? STAT_MEM_CALLOC_AMOUNT:STAT_MEM_ECALLOC_AMOUNT;
+		*(size_t *) ret = size;
 		MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, size);
 	}
 
@@ -789,9 +789,9 @@ void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQL
 	DBG_INF_FMT("new_ptr=%p", ret); 
 
 	if (collect_memory_statistics) {
-		*(size_t *) ret = new_size;
 		enum mysqlnd_collected_stats s1 = persistent? STAT_MEM_REALLOC_COUNT:STAT_MEM_EREALLOC_COUNT;
 		enum mysqlnd_collected_stats s2 = persistent? STAT_MEM_REALLOC_AMOUNT:STAT_MEM_EREALLOC_AMOUNT;
+		*(size_t *) ret = new_size;
 		MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, new_size);
 	}
 	DBG_RETURN(FAKE_PTR(ret));