- fix SEGV when there's an exception in HttpRequest::onFinish()
authorMichael Wallner <mike@php.net>
Mon, 4 Dec 2006 17:13:46 +0000 (17:13 +0000)
committerMichael Wallner <mike@php.net>
Mon, 4 Dec 2006 17:13:46 +0000 (17:13 +0000)
http_request_object.c

index 3fbfdbf..319cb4f 100644 (file)
@@ -721,6 +721,8 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
                ret = FAILURE;
        }
        
+       http_request_set_progress_callback(obj->request, NULL);
+       
        if (!EG(exception) && zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) {
                zval *param;
                
@@ -732,8 +734,6 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
                zval_ptr_dtor(&param);
        }
        
-       http_request_set_progress_callback(obj->request, NULL);
-       
        return ret;
 }