archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix crashes in the allocator in case of OOM.

Browse source
This commit is contained in:
Andrey Hristov 2010-05-27 12:00:48 +00:00
parent b7385f02fd
commit 5efee3d587
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/mysqlnd/mysqlnd_debug.c
View file

@ -932,7 +932,7 @@ void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D)
#endif
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
if (collect_memory_statistics) {
if (ret && collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_MALLOC_COUNT, 1, STAT_MEM_MALLOC_AMOUNT, size);
}
@ -963,7 +963,7 @@ void * _mysqlnd_calloc(unsigned int nmemb, size_t size MYSQLND_MEM_D)
#endif
DBG_INF_FMT("size=%lu ptr=%p", size, ret);
if (collect_memory_statistics) {
if (ret && collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_CALLOC_COUNT, 1, STAT_MEM_CALLOC_AMOUNT, size);
}
@ -997,7 +997,7 @@ void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D)
DBG_INF_FMT("new_ptr=%p", (char*)ret);
if (collect_memory_statistics) {
if (ret && collect_memory_statistics) {
*(size_t *) ret = new_size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_REALLOC_COUNT, 1, STAT_MEM_REALLOC_AMOUNT, new_size);
}
@ -1082,7 +1082,7 @@ char * _mysqlnd_pestrdup(const char * const ptr, zend_bool persistent MYSQLND_ME
ret = pemalloc(tmp_str.len + sizeof(size_t), persistent);
memcpy(FAKE_PTR(ret), tmp_str.c, tmp_str.len);
if (collect_memory_statistics) {
if (ret && collect_memory_statistics) {
*(size_t *) ret = tmp_str.len;
MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_STRDUP_COUNT : STAT_MEM_ESTRDUP_COUNT);
}