cvs: php-src(PHP_5_0) / NEWS /ext/curl interface.c php_curl.h
| From: | Antony Dovgal | Date: | Thu, 02 Jun 2005 21:04:43 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/curl interface.c php_curl.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32086@lists.php.net to get a copy of this message | ||
tony2001 Thu Jun 2 17:04:43 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/curl interface.c php_curl.h
Log:
MFH: fix bug #33222 (segfault when CURL handle is closed in a callback).
fix segfaults when CURL callback functions throw exception.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.413&r2=1.1760.2.414&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.413 php-src/NEWS:1.1760.2.414
--- php-src/NEWS:1.1760.2.413 Thu Jun 2 11:42:44 2005
+++ php-src/NEWS Thu Jun 2 17:04:43 2005
@@ -13,6 +13,8 @@
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.46.2.7&r2=1.46.2.8&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.46.2.7 php-src/ext/curl/interface.c:1.46.2.8
--- php-src/ext/curl/interface.c:1.46.2.7 Mon Mar 14 04:02:42 2005
+++ php-src/ext/curl/interface.c Thu Jun 2 17:04:43 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.46.2.7 2005/03/14 09:02:42 sniper Exp $ */
+/* $Id: interface.c,v 1.46.2.8 2005/06/02 21:04:43 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -484,20 +484,22 @@
fci.no_separation = 0;
fci.symbol_table = NULL;
+ ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
+ ch->in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not call the
CURLOPT_WRITEFUNCTION");
length = -1;
- } else {
+ } else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) != IS_LONG) {
convert_to_long_ex(&retval_ptr);
}
length = Z_LVAL_P(retval_ptr);
+ zval_ptr_dtor(&retval_ptr);
}
zval_ptr_dtor(argv[0]);
zval_ptr_dtor(argv[1]);
- zval_ptr_dtor(&retval_ptr);
break;
}
}
@@ -554,20 +556,22 @@
fci.no_separation = 0;
fci.symbol_table = NULL;
+ ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
+ ch->in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION");
- } else {
+ } else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) == IS_STRING) {
length = MIN(size * nmemb, Z_STRLEN_P(retval_ptr));
memcpy(data, Z_STRVAL_P(retval_ptr), length);
}
+ zval_ptr_dtor(&retval_ptr);
}
zval_ptr_dtor(argv[0]);
zval_ptr_dtor(argv[1]);
zval_ptr_dtor(argv[2]);
- zval_ptr_dtor(&retval_ptr);
break;
}
}
@@ -625,19 +629,21 @@
fci.params = argv;
fci.no_separation = 0;
+ ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
+ ch->in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not call the
CURLOPT_HEADERFUNCTION");
length = -1;
- } else {
+ } else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) != IS_LONG) {
convert_to_long_ex(&retval_ptr);
}
length = Z_LVAL_P(retval_ptr);
+ zval_ptr_dtor(&retval_ptr);
}
zval_ptr_dtor(argv[0]);
zval_ptr_dtor(argv[1]);
- zval_ptr_dtor(&retval_ptr);
break;
}
@@ -773,6 +779,8 @@
(*ch)->handlers->write_header = ecalloc(1, sizeof(php_curl_write));
(*ch)->handlers->read = ecalloc(1, sizeof(php_curl_read));
+ (*ch)->in_callback = 0;
+
memset(&(*ch)->err, 0, sizeof((*ch)->err));
zend_llist_init(&(*ch)->to_free.str, sizeof(char *), (void(*)(void *))
curl_free_string, 0);
@@ -1468,6 +1476,12 @@
}
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
+
+ if (ch->in_callback) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close CURL handle from a
callback");
+ return;
+ }
+
if (ch->uses) {
ch->uses--;
} else {
http://cvs.php.net/diff.php/php-src/ext/curl/php_curl.h?r1=1.41&r2=1.41.2.1&ty=u
Index: php-src/ext/curl/php_curl.h
diff -u php-src/ext/curl/php_curl.h:1.41 php-src/ext/curl/php_curl.h:1.41.2.1
--- php-src/ext/curl/php_curl.h:1.41 Fri Mar 12 13:37:55 2004
+++ php-src/ext/curl/php_curl.h Thu Jun 2 17:04:43 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_curl.h,v 1.41 2004/03/12 18:37:55 sterling Exp $ */
+/* $Id: php_curl.h,v 1.41.2.1 2005/06/02 21:04:43 tony2001 Exp $ */
#ifndef _PHP_CURL_H
#define _PHP_CURL_H
@@ -121,6 +121,7 @@
php_curl_handlers *handlers;
long id;
unsigned int uses;
+ zend_bool in_callback;
} php_curl;
typedef struct {