diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-09-15 15:04:59 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-09-15 15:04:59 +0000 |
| commit | 0974e2af6084b446b04a9f213eb8b640a7e22b77 (patch) | |
| tree | 213069373644aea6b2fd677127d98e808e1568ac /ext/curl | |
| parent | 0094b08c56e409324d69342a7e8a46f7cac50771 (diff) | |
| download | php-git-0974e2af6084b446b04a9f213eb8b640a7e22b77.tar.gz | |
MFH: fix segfault in curl_multi_info_read()
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/multi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index b1c9f77b35..78387cd4af 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -62,7 +62,7 @@ PHP_FUNCTION(curl_multi_init) mh = ecalloc(1, sizeof(php_curlm)); mh->multi = curl_multi_init(); - zend_llist_init(&mh->easyh, sizeof(zval *), (llist_dtor_func_t) NULL, 0); + zend_llist_init(&mh->easyh, sizeof(zval), (llist_dtor_func_t) NULL, 0); ZEND_REGISTER_RESOURCE(return_value, mh, le_curl_multi_handle); } @@ -250,12 +250,12 @@ PHP_FUNCTION(curl_multi_info_read) { zend_llist_position pos; php_curl *ch; - zval **pz_ch; + zval *pz_ch; /* search the list of easy handles hanging off the multi-handle */ - for(pz_ch = (zval **)zend_llist_get_first_ex(&mh->easyh, &pos); pz_ch; - pz_ch = (zval **)zend_llist_get_next_ex(&mh->easyh, &pos)) { - ZEND_FETCH_RESOURCE(ch, php_curl *, pz_ch, -1, le_curl_name, le_curl); + for(pz_ch = (zval *)zend_llist_get_first_ex(&mh->easyh, &pos); pz_ch; + pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) { + ZEND_FETCH_RESOURCE(ch, php_curl *, &pz_ch, -1, le_curl_name, le_curl); if (ch->cp == tmp_msg->easy_handle) { /* we are adding a reference to the underlying php_curl @@ -266,12 +266,12 @@ PHP_FUNCTION(curl_multi_info_read) SEPARATE_ZVAL, but those create new zvals, which is already being done in add_assoc_resource */ - zend_list_addref( Z_RESVAL_PP( pz_ch ) ); + zend_list_addref( Z_RESVAL_P( pz_ch ) ); /* add_assoc_resource automatically creates a new zval to wrap the "resource" represented by the current pz_ch */ - add_assoc_resource(return_value, "handle", Z_RESVAL_PP(pz_ch)); + add_assoc_resource(return_value, "handle", Z_RESVAL_P(pz_ch)); break; } |