Skip to content
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

Fix crash in PDO_ODBC statement dtor #17586

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Fix crash in PDO_ODBC statement dtor #17586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ext/pdo_odbc/odbc_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ static int odbc_stmt_dtor(pdo_stmt_t *stmt)
{
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;

if (S->stmt != SQL_NULL_HANDLE) {
// TODO: Factor this out; pg/mysql/firebird do the same thing
bool server_obj_usable = !Z_ISUNDEF(stmt->database_object_handle)
&& IS_OBJ_VALID(EG(objects_store).object_buckets[Z_OBJ_HANDLE(stmt->database_object_handle)])
&& !(OBJ_FLAGS(Z_OBJ(stmt->database_object_handle)) & IS_OBJ_FREE_CALLED);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is super ugly. Wouldn't it be cleaner if the dbh would keep a list of stmts, so it could null stmt->H when being destroyed?

Copy link
Member

@nielsdos nielsdos Jan 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's more convoluted and consumes more memory, and the dbh destruction (at the driver site) already destroys the driver statements too. Imo, this is good enough especially when hidden behind a function.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough!

Could it make sense to move that into Zend/ to have a generic function? I think that not only PDO is affected by this; likely also other DB extensions, and even others (enchant broker/dictinonary comes to mind)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enchant shouldn't be affected as it does not create strong cycles and even does its own refcounting of the broker IIRC.
Other DB extension: could be affected indeed.

if (S->stmt != SQL_NULL_HANDLE && server_obj_usable) {
if (stmt->executed) {
SQLCloseCursor(S->stmt);
}
Expand Down
Loading