clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible crashes, in case of OOM, due to half-baken

Browse Source 
objects.
This commit is contained in:
Andrey Hristov 2010-05-27 12:05:02 +00:00
parent 5efee3d587
commit ce2fbe1931
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/mysqlnd/mysqlnd_result.c
View File

@ -326,6 +326,10 @@ MYSQLND_METHOD(mysqlnd_res, read_result_metadata)(MYSQLND_RES * result, MYSQLND
}
result->meta = result->m.result_meta_init(result->field_count, result->persistent TSRMLS_CC);
if (!result->meta) {
SET_OOM_ERROR(conn->error_info);
DBG_RETURN(FAIL);
}
/* 1. Read all fields metadata */

31
ext/mysqlnd/mysqlnd_result_meta.c
View File

@ -475,17 +475,30 @@ mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_D
MYSQLND_RES_METADATA *ret = mnd_pecalloc(1, alloc_size, persistent);
DBG_ENTER("mysqlnd_result_meta_init");
DBG_INF_FMT("persistent=%d", persistent);
do {
if (!ret) {
break;
}
ret->m = & mysqlnd_mysqlnd_res_meta_methods;
ret->persistent = persistent;
ret->field_count = field_count;
/* +1 is to have empty marker at the end */
ret->fields = mnd_pecalloc(field_count + 1, sizeof(MYSQLND_FIELD), ret->persistent);
ret->zend_hash_keys = mnd_pecalloc(field_count, sizeof(struct mysqlnd_field_hash_key), ret->persistent);
ret->m = & mysqlnd_mysqlnd_res_meta_methods;
DBG_INF_FMT("meta=%p", ret);
DBG_RETURN(ret);
ret->persistent = persistent;
ret->field_count = field_count;
/* +1 is to have empty marker at the end */
ret->fields = mnd_pecalloc(field_count + 1, sizeof(MYSQLND_FIELD), ret->persistent);
ret->zend_hash_keys = mnd_pecalloc(field_count, sizeof(struct mysqlnd_field_hash_key), ret->persistent);
if (!ret->fields || !ret->zend_hash_keys) {
break;
}
DBG_INF_FMT("meta=%p", ret);
DBG_RETURN(ret);
} while (0);
if (ret) {
ret->m->free_metadata(ret TSRMLS_CC);
}
DBG_RETURN(NULL);
}
/* }}} */
/* {{{ mysqlnd_res_meta_get_methods */