ext/pdo_sqlite: PDO::sqliteCreateCollection return type strenghtening.

Is supposed to be Pdo_Sqlite::createCollation but behavior differs in
regard of return type checks.

Author: devnexen

ext/pdo_sqlite/pdo_sqlite.c

@@ -385,14 +385,14 @@ static int php_sqlite_collation_callback(void *context, int string1_len, const v
 			zend_type_error("%s(): Return value of the collation callback must be of type int, %s returned",
 				ZSTR_VAL(func_name), zend_zval_value_name(&retval));
 			zend_string_release(func_name);
-			zval_ptr_dtor(&retval);
-			return FAILURE;
+			ret = FAILURE;
 		}
 		if (Z_LVAL(retval) > 0) {
 			ret = 1;
 		} else if (Z_LVAL(retval) < 0) {
 			ret = -1;
 		}
+		zval_ptr_dtor(&retval);
 	}
 
 	return ret;

ext/pdo_sqlite/sqlite_driver.c

@@ -483,9 +483,16 @@ static int php_sqlite3_collation_callback(void *context, int string1_len, const
 
 	zend_call_known_fcc(&collation->callback, &retval, /* argc */ 2, zargs, /* named_params */ NULL);
 
+	zval_ptr_dtor(&zargs[0]);
+	zval_ptr_dtor(&zargs[1]);
+
 	if (!Z_ISUNDEF(retval)) {
 		if (Z_TYPE(retval) != IS_LONG) {
-			convert_to_long(&retval);
+			zend_string *func_name = get_active_function_or_method_name();
+			zend_type_error("%s(): Return value of the collation callback must be of type int, %s returned",
+				ZSTR_VAL(func_name), zend_zval_value_name(&retval));
+			zend_string_release(func_name);
+			ret = FAILURE;
 		}
 		if (Z_LVAL(retval) > 0) {
 			ret = 1;
@@ -495,9 +502,6 @@ static int php_sqlite3_collation_callback(void *context, int string1_len, const
 		zval_ptr_dtor(&retval);
 	}
 
-	zval_ptr_dtor(&zargs[0]);
-	zval_ptr_dtor(&zargs[1]);
-
 	return ret;
 }