Skip to content

ext/sqlite3: fix wrong pointer types passed to the free list comparator. #21483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devnexen wants to merge 2 commits into
base: PHP-8.5
Choose a base branch
from
Open

ext/sqlite3: fix wrong pointer types passed to the free list comparator. #21483

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18d287e
ext/sqlite3: fix wrong pointer types passed to the free list comparator.
devnexen Mar 21, 2026
c66dde1
ext/sqlite3: compare php_sqlite3_stmt pointers consistently.
devnexen Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/sqlite3/sqlite3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ZEND_DECLARE_MODULE_GLOBALS(sqlite3)
static PHP_GINIT_FUNCTION(sqlite3);
static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, const char *arg2, const char *arg3, const char *arg4);
static void sqlite3_param_dtor(zval *data);
static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, sqlite3_stmt *statement);
static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, php_sqlite3_stmt *statement);
static zend_always_inline void php_sqlite3_fetch_one(int n_cols, php_sqlite3_result *result_obj, zend_long mode, zval *result);

#define SQLITE3_CHECK_INITIALIZED(db_obj, member, class_name) \
Expand Down Expand Up @@ -2145,7 +2145,7 @@ PHP_METHOD(SQLite3Result, finalize)

/* We need to finalize an internal statement */
if (!result_obj->is_prepared_statement) {
zend_llist_del_element(&(result_obj->db_obj->free_list), &result_obj->stmt_obj,
zend_llist_del_element(&(result_obj->db_obj->free_list), result_obj->stmt_obj,
(int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
} else {
sqlite3_reset(result_obj->stmt_obj->stmt);
Expand Down Expand Up @@ -2260,9 +2260,9 @@ static void php_sqlite3_free_list_dtor(void **item)
}
/* }}} */

static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, sqlite3_stmt *statement ) /* {{{ */
static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, php_sqlite3_stmt *statement ) /* {{{ */
{
return ((*stmt_obj_ptr)->initialised && statement == (*stmt_obj_ptr)->stmt);
return ((*stmt_obj_ptr)->initialised && statement == *stmt_obj_ptr);
}
/* }}} */

Expand Down Expand Up @@ -2376,7 +2376,7 @@ static void php_sqlite3_stmt_object_free_storage(zend_object *object) /* {{{ */
}

if (intern->initialised) {
zend_llist_del_element(&(intern->db_obj->free_list), intern->stmt,
zend_llist_del_element(&(intern->db_obj->free_list), intern,
(int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
}

Expand Down
Loading