archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Handle OOM in block_alloc_get_chunk, and also in the caller

Browse source 
in mysqlnd_wireprotocol.c
This commit is contained in:
Andrey Hristov 2010-05-03 16:20:46 +00:00
parent 864f2da733
commit f9fe805abe
2 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

45
ext/mysqlnd/mysqlnd_block_alloc.c
View file

@ -119,29 +119,30 @@ MYSQLND_MEMORY_POOL_CHUNK * mysqlnd_mempool_get_chunk(MYSQLND_MEMORY_POOL * pool
DBG_ENTER("mysqlnd_mempool_get_chunk"); DBG_ENTER("mysqlnd_mempool_get_chunk");
chunk = mnd_malloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK)); chunk = mnd_malloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK));
if (chunk) {
chunk->free_chunk = mysqlnd_mempool_free_chunk; chunk->free_chunk = mysqlnd_mempool_free_chunk;
chunk->resize_chunk = mysqlnd_mempool_resize_chunk; chunk->resize_chunk = mysqlnd_mempool_resize_chunk;
chunk->size = size; chunk->size = size;
/* /*
Should not go over MYSQLND_MAX_PACKET_SIZE, since we Should not go over MYSQLND_MAX_PACKET_SIZE, since we
expect non-arena memory in mysqlnd_wireprotocol.c . We expect non-arena memory in mysqlnd_wireprotocol.c . We
realloc the non-arena memory. realloc the non-arena memory.
*/ */
chunk->pool = pool; chunk->pool = pool;
if (size > pool->free_size) { if (size > pool->free_size) {
chunk->from_pool = FALSE; chunk->from_pool = FALSE;
chunk->ptr = mnd_malloc(size); chunk->ptr = mnd_malloc(size);
if (!chunk->ptr) { if (!chunk->ptr) {
chunk->free_chunk(chunk TSRMLS_CC); chunk->free_chunk(chunk TSRMLS_CC);
chunk = NULL; chunk = NULL;
}
} else {
chunk->from_pool = TRUE;
++pool->refcount;
chunk->ptr = pool->arena + (pool->arena_size - pool->free_size);
/* Last step, update free_size */
pool->free_size -= size;
} }
} else {
chunk->from_pool = TRUE;
++pool->refcount;
chunk->ptr = pool->arena + (pool->arena_size - pool->free_size);
/* Last step, update free_size */
pool->free_size -= size;
} }
DBG_RETURN(chunk); DBG_RETURN(chunk);
} }

4
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -1136,6 +1136,10 @@ php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * result_set_memory_
to be able to implement read-only variables. Thus, we add + 1. to be able to implement read-only variables. Thus, we add + 1.
*/ */
*buffer = result_set_memory_pool->get_chunk(result_set_memory_pool, *data_size + 1 TSRMLS_CC); *buffer = result_set_memory_pool->get_chunk(result_set_memory_pool, *data_size + 1 TSRMLS_CC);
if (!*buffer) {
ret = FAIL;
break;
}
p = (*buffer)->ptr; p = (*buffer)->ptr;
} else if (!first_iteration) { } else if (!first_iteration) {
/* Empty packet after MYSQLND_MAX_PACKET_SIZE packet. That's ok, break */ /* Empty packet after MYSQLND_MAX_PACKET_SIZE packet. That's ok, break */