Initialize FCI/FCC

Author: Girgias

ext/sqlite3/sqlite3.c

@@ -943,8 +943,8 @@ PHP_METHOD(SQLite3, createFunction)
 	php_sqlite3_func *func;
 	char *sql_func;
 	size_t sql_func_len;
-	zend_fcall_info fci;
-	zend_fcall_info_cache fcc;
+	zend_fcall_info fci = empty_fcall_info;
+	zend_fcall_info_cache fcc = empty_fcall_info_cache;
 	zend_long sql_func_num_args = -1;
 	zend_long flags = 0;
 	db_obj = Z_SQLITE3_DB_P(object);
@@ -989,8 +989,10 @@ PHP_METHOD(SQLite3, createAggregate)
 	php_sqlite3_func *func;
 	char *sql_func;
 	size_t sql_func_len;
-	zend_fcall_info step_fci, fini_fci;
-	zend_fcall_info_cache step_fcc, fini_fcc;
+	zend_fcall_info step_fci = empty_fcall_info;
+	zend_fcall_info_cache step_fcc = empty_fcall_info_cache;
+	zend_fcall_info fini_fci = empty_fcall_info;
+	zend_fcall_info_cache fini_fcc = empty_fcall_info_cache;
 	zend_long sql_func_num_args = -1;
 	db_obj = Z_SQLITE3_DB_P(object);
 
@@ -1026,12 +1028,8 @@ PHP_METHOD(SQLite3, createAggregate)
 	efree(func);
 
 	error:
-	if (ZEND_FCC_INITIALIZED(step_fcc)) {
-		zend_release_fcall_info_cache(&step_fcc);
-	}
-	if (ZEND_FCC_INITIALIZED(fini_fcc)) {
-		zend_release_fcall_info_cache(&fini_fcc);
-	}
+	zend_release_fcall_info_cache(&step_fcc);
+	zend_release_fcall_info_cache(&fini_fcc);
 
 	RETURN_FALSE;
 }
@@ -1045,8 +1043,8 @@ PHP_METHOD(SQLite3, createCollation)
 	php_sqlite3_collation *collation;
 	char *collation_name;
 	size_t collation_name_len;
-	zend_fcall_info fci;
-	zend_fcall_info_cache fcc;
+	zend_fcall_info fci = empty_fcall_info;
+	zend_fcall_info_cache fcc = empty_fcall_info_cache;
 	db_obj = Z_SQLITE3_DB_P(object);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "sF", &collation_name, &collation_name_len, &fci, &fcc) == FAILURE) {
@@ -1312,16 +1310,15 @@ PHP_METHOD(SQLite3, enableExceptions)
 /* {{{ Register a callback function to be used as an authorizer by SQLite. The callback should return SQLite3::OK, SQLite3::IGNORE or SQLite3::DENY. */
 PHP_METHOD(SQLite3, setAuthorizer)
 {
-	php_sqlite3_db_object *db_obj;
-	zval *object = ZEND_THIS;
-	db_obj = Z_SQLITE3_DB_P(object);
-	zend_fcall_info			fci;
-	zend_fcall_info_cache	fcc;
+	zend_fcall_info fci = empty_fcall_info;
+	zend_fcall_info_cache fcc = empty_fcall_info_cache;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_FUNC_NO_TRAMPOLINE_FREE_OR_NULL(fci, fcc)
 	ZEND_PARSE_PARAMETERS_END();
 
+	php_sqlite3_db_object *db_obj = Z_SQLITE3_DB_P(ZEND_THIS);
+
 	SQLITE3_CHECK_INITIALIZED_FREE_TRAMPOLINE(db_obj, db_obj->initialised, SQLite3, &fcc);
 
 	/* Clear previously set callback */

ext/sqlite3/tests/sqlite3_trampoline_create_aggregate_no_leak.phpt

@@ -28,6 +28,11 @@ $finalize = [$o, 'finalize'];
 
 var_dump($db->createAggregate('', $step, $finalize, 1));
 
+try {
+    var_dump($db->createAggregate(new stdClass(), $step, $finalize, new stdClass()));
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 try {
     var_dump($db->createAggregate('S', $step, $finalize, new stdClass()));
 } catch (\Throwable $e) {
@@ -68,6 +73,7 @@ echo "Done\n";
 ?>
 --EXPECT--
 bool(false)
+TypeError: SQLite3::createAggregate(): Argument #1 ($name) must be of type string, stdClass given
 TypeError: SQLite3::createAggregate(): Argument #4 ($argCount) must be of type int, stdClass given
 TypeError: SQLite3::createAggregate(): Argument #3 ($finalCallback) must be a valid callback, function "no_func" not found or invalid function name
 TypeError: SQLite3::createAggregate(): Argument #2 ($stepCallback) must be a valid callback, function "no_func" not found or invalid function name

ext/sqlite3/tests/sqlite3_trampoline_createcollation_no_leak.phpt

@@ -17,6 +17,12 @@ $o = new TrampolineTest();
 $callback = [$o, 'NAT'];
 
 var_dump($db->createCollation('', $callback));
+
+try {
+    var_dump($db->createCollation(new stdClass(), $callback));
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 try {
     var_dump($db->createCollation('NAT', $callback, new stdClass()));
 } catch (\Throwable $e) {
@@ -38,6 +44,7 @@ var_dump($db->createCollation('NAT', $callback));
 ?>
 --EXPECT--
 bool(false)
+TypeError: SQLite3::createCollation(): Argument #1 ($name) must be of type string, stdClass given
 ArgumentCountError: SQLite3::createCollation() expects exactly 2 arguments, 3 given
 Invalid SQLite3 object:
 Error: The SQLite3 object has not been correctly initialised or is already closed

ext/sqlite3/tests/sqlite3_trampoline_createfunction_no_leak.phpt

@@ -18,6 +18,12 @@ $callback = [$o, 'strtoupper'];
 
 var_dump($db->createfunction('', $callback));
 
+try {
+    var_dump($db->createfunction(new stdClass(), $callback, new stdClass()));
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
 try {
     var_dump($db->createfunction('strtoupper', $callback, new stdClass()));
 } catch (\Throwable $e) {
@@ -39,6 +45,7 @@ var_dump($db->createfunction('strtoupper', $callback));
 ?>
 --EXPECT--
 bool(false)
+TypeError: SQLite3::createFunction(): Argument #1 ($name) must be of type string, stdClass given
 TypeError: SQLite3::createFunction(): Argument #3 ($argCount) must be of type int, stdClass given
 Invalid SQLite3 object:
 Error: The SQLite3 object has not been correctly initialised or is already closed

ext/sqlite3/tests/sqlite3_trampoline_setauthorizer_null.phpt

@@ -0,0 +1,26 @@
+--TEST--
+SQLite3 user authorizer null
+--EXTENSIONS--
+sqlite3
+--FILE--
+<?php
+
+$db = new SQLite3(':memory:');
+$db->enableExceptions(true);
+
+$db->setAuthorizer(null);
+
+// This query should be accepted
+var_dump($db->querySingle('SELECT 1;'));
+
+try {
+    // This one should fail
+    var_dump($db->querySingle('CREATE TABLE test (a, b);'));
+} catch (\Exception $e) {
+    echo $e->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+int(1)
+NULL