Fixed support for callbacks with "void" return type

dstogov · dstogov · commit ff5fa0d6312e · 2019-03-05T01:03:47.000+03:00
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
@@ -750,6 +750,7 @@ static void zend_ffi_callback_trampoline(ffi_cif* cif, void* ret, void** args, v
 {
 	zend_ffi_callback_data *callback_data = (zend_ffi_callback_data*)data;
 	zend_fcall_info fci;
+	zend_ffi_type *ret_type;
 	zval retval;
 	ALLOCA_FLAG(use_heap)
 
@@ -787,7 +788,10 @@ static void zend_ffi_callback_trampoline(ffi_cif* cif, void* ret, void** args, v
 	}
 	free_alloca(fci.params, use_heap);
 
-	zend_ffi_zval_to_cdata(ret, ZEND_FFI_TYPE(callback_data->type->func.ret_type), &retval);
+	ret_type = ZEND_FFI_TYPE(callback_data->type->func.ret_type);
+	if (ret_type->kind != ZEND_FFI_TYPE_VOID) {
+		zend_ffi_zval_to_cdata(ret, ret_type, &retval);
+	}
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -750,6 +750,7 @@ static void zend_ffi_callback_trampoline(ffi_cif* cif, void* ret, void** args, v`
`750`	`750`	`{`
`751`	`751`	`zend_ffi_callback_data callback_data = (zend_ffi_callback_data)data;`
`752`	`752`	`zend_fcall_info fci;`
	`753`	`+ zend_ffi_type *ret_type;`
`753`	`754`	`zval retval;`
`754`	`755`	`ALLOCA_FLAG(use_heap)`
`755`	`756`
`@@ -787,7 +788,10 @@ static void zend_ffi_callback_trampoline(ffi_cif* cif, void* ret, void** args, v`
`787`	`788`	`}`
`788`	`789`	`free_alloca(fci.params, use_heap);`
`789`	`790`
`790`		`- zend_ffi_zval_to_cdata(ret, ZEND_FFI_TYPE(callback_data->type->func.ret_type), &retval);`
	`791`	`+ ret_type = ZEND_FFI_TYPE(callback_data->type->func.ret_type);`
	`792`	`+ if (ret_type->kind != ZEND_FFI_TYPE_VOID) {`
	`793`	`+ zend_ffi_zval_to_cdata(ret, ret_type, &retval);`
	`794`	`+ }`
`791`	`795`	`}`
`792`	`796`	`/* }}} */`
`793`	`797`