com php-src: Fixed segfaults: ext/mysqlnd/mysqlnd_reverse_a pi.c ext/mysqlnd/php_mysqlnd.c

Commit: 98afbc7f75580386a86b1f616ed96416d1a97b7e Author: Xinchen Hui <laruence@php.net> Wed, 18 Jun 2014 15:43:15 +0800 Parents: ac1d6abbef5b046f768da7d596a59b7209f3ee1b Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98afbc7f75580386a86b1f616ed96416d1a97b7e Log: Fixed segfaults Changed paths: M ext/mysqlnd/mysqlnd_reverse_api.c M ext/mysqlnd/php_mysqlnd.c Diff: diff --git a/ext/mysqlnd/mysqlnd_reverse_api.c b/ext/mysqlnd/mysqlnd_reverse_api.c index 332669d..4968487 100644 --- a/ext/mysqlnd/mysqlnd_reverse_api.c +++ b/ext/mysqlnd/mysqlnd_reverse_api.c @@ -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; diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index d5f8b20..3bcaa06 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -58,7 +58,7 @@ mysqlnd_minfo_print_hash(zval *values) static int mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument TSRMLS_DC) { - struct st_mysqlnd_plugin_header * plugin_header = *(struct st_mysqlnd_plugin_header **)Z_PTR_P(el); + struct st_mysqlnd_plugin_header * plugin_header = (struct st_mysqlnd_plugin_header *)Z_PTR_P(el); if (plugin_header->plugin_stats.values) { char buf[64]; zval values; @@ -82,7 +82,7 @@ static int mysqlnd_minfo_dump_loaded_plugins(zval *el, void * buf TSRMLS_DC) { smart_str * buffer = (smart_str *) buf; - struct st_mysqlnd_plugin_header * plugin_header = *(struct st_mysqlnd_plugin_header **)Z_PTR_P(el); + struct st_mysqlnd_plugin_header * plugin_header = (struct st_mysqlnd_plugin_header *)Z_PTR_P(el); if (plugin_header->plugin_name) { if (buffer->s) { smart_str_appendc(buffer, ','); @@ -99,13 +99,13 @@ static void mysqlnd_minfo_dump_api_plugins(smart_str * buffer TSRMLS_DC) { HashTable *ht = mysqlnd_reverse_api_get_api_list(TSRMLS_C); - MYSQLND_REVERSE_API **ext; + MYSQLND_REVERSE_API *ext; ZEND_HASH_FOREACH_PTR(ht, ext) { if (buffer->s) { smart_str_appendc(buffer, ','); } - smart_str_appends(buffer, (*ext)->module->name); + smart_str_appends(buffer, ext->module->name); } ZEND_HASH_FOREACH_END(); } /* }}} */