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

Fixed segfaults

Browse source
This commit is contained in:
Xinchen Hui 2014-06-18 15:43:15 +08:00
parent ac1d6abbef
commit 98afbc7f75
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/mysqlnd/mysqlnd_reverse_api.c
View file

@ -60,7 +60,7 @@ mysqlnd_reverse_api_get_api_list(TSRMLS_D)
PHPAPI void
mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext TSRMLS_DC)
{
zend_hash_str_add_ptr(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name), &apiext);
zend_hash_str_add_ptr(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name), apiext);
}
/* }}} */
@ -72,12 +72,9 @@ zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned
MYSQLND * retval;
#ifdef OLD_CODE
MYSQLND_REVERSE_API * elem;
for (zend_hash_internal_pointer_reset(&mysqlnd_api_ext_ht);
zend_hash_get_current_data(&mysqlnd_api_ext_ht, (void **)&elem) == SUCCESS;
zend_hash_move_forward(&mysqlnd_api_ext_ht))
{
if ((*elem)->conversion_cb) {
retval = (*elem)->conversion_cb(zv TSRMLS_CC);
ZEND_HASH_FOREACH_PTR(&mysqlnd_api_ext_ht, elem) {
if (elem->conversion_cb) {
retval = elem->conversion_cb(zv TSRMLS_CC);
if (retval) {
if (retval->data) {
*save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities TSRMLS_CC);
@ -85,11 +82,10 @@ zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned
return retval;
}
}
}
} ZEND_HASH_FOREACH_END();
#else
zval * elem;
ZEND_HASH_FOREACH_VAL(&mysqlnd_api_ext_ht, elem) {
MYSQLND_REVERSE_API * api = (MYSQLND_REVERSE_API *) Z_PTR_P(elem);
MYSQLND_REVERSE_API * api;
ZEND_HASH_FOREACH_PTR(&mysqlnd_api_ext_ht, api) {
if (api && api->conversion_cb) {
retval = api->conversion_cb(zv TSRMLS_CC);
if (retval) {
@ -99,7 +95,6 @@ zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned
return retval;
}
}
} ZEND_HASH_FOREACH_END();
#endif
return NULL;