changes from feedback

we do not set curl (function) user handler if there is no actual
callback.

Author: devnexen

Zend/zend_API.h

@@ -843,12 +843,6 @@ static zend_always_inline void zend_call_known_fcc(
 	const zend_fcall_info_cache *fcc, zval *retval_ptr, uint32_t param_count, zval *params, HashTable *named_params)
 {
 	zend_function *func = fcc->function_handler;
-	if (UNEXPECTED(!func)) {
-		if (retval_ptr) {
-			ZVAL_UNDEF(retval_ptr);
-		}
-		return;
-	}
 	/* Need to copy trampolines as they get released after they are called */
 	if (UNEXPECTED(func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
 		func = (zend_function*) emalloc(sizeof(zend_function));

ext/curl/interface.c

@@ -1631,12 +1631,19 @@ static bool php_curl_set_callable_handler(zend_fcall_info_cache *const handler_f
 }
 
 
-#define HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(curl_ptr, constant_no_function, handler_type) \
+#define HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(curl_ptr, constant_no_function, handler_type, default_method) \
 	case constant_no_function##FUNCTION: { \
 		bool result = php_curl_set_callable_handler(&curl_ptr->handlers.handler_type->fcc, zvalue, is_array_config, #constant_no_function "FUNCTION"); \
 		if (!result) { \
 			return FAILURE; \
 		} \
+		if (!curl_ptr->handlers.handler_type) { \
+			return SUCCESS; \
+		} \
+		if (!curl_ptr->handlers.handler_type->fcc.function_handler || !ZEND_FCC_INITIALIZED(curl_ptr->handlers.handler_type->fcc)) { \
+			curl_ptr->handlers.handler_type->method = default_method; \
+			return FAILURE; \
+		} \
 		curl_ptr->handlers.handler_type->method = PHP_CURL_USER; \
 		break; \
 	}
@@ -1659,9 +1666,9 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
 
 	switch (option) {
 		/* Callable options */
-		HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_WRITE, write);
-		HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_HEADER, write_header);
-		HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_READ, read);
+		HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_WRITE, write, PHP_CURL_STDOUT);
+		HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_HEADER, write_header, PHP_CURL_IGNORE);
+		HANDLE_CURL_OPTION_CALLABLE_PHP_CURL_USER(ch, CURLOPT_READ, read, PHP_CURL_DIRECT);
 
 		HANDLE_CURL_OPTION_CALLABLE(ch, CURLOPT_PROGRESS, handlers.progress, curl_progress);
 		HANDLE_CURL_OPTION_CALLABLE(ch, CURLOPT_XFERINFO, handlers.xferinfo, curl_xferinfo);

ext/curl/tests/gh16359.phpt

@@ -1,5 +1,5 @@
 --TEST--
-GH-16360 - curl_setopt with CURLOPT_WRITEFUNCTION and no user fn
+GH-16359 - curl_setopt with CURLOPT_WRITEFUNCTION and no user fn
 --EXTENSIONS--
 curl
 --FILE--
@@ -11,7 +11,6 @@ $ch = curl_init();
 curl_setopt($ch, CURLOPT_WRITEFUNCTION, null);
 curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
 curl_exec($ch);
-echo "DONE";
 ?>
 --EXPECT--
-DONE
+test