Skip to content

Fix logic error in PDO #6215

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

Closed
Girgias wants to merge 1 commit into from
Closed

Fix logic error in PDO #6215

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
7 changes: 6 additions & 1 deletion ext/pdo/pdo_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,12 @@ int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, in
mode = Z_LVAL(args[skip]);
flags = mode & PDO_FETCH_FLAGS;

retval = pdo_stmt_verify_mode(stmt, mode, 0);
/* pdo_stmt_verify_mode() returns a boolean value */
if (pdo_stmt_verify_mode(stmt, mode, 0)) {
retval = SUCCESS;
} else {
retval = FAILURE;
}
Copy link
Member

@nikic nikic Sep 25, 2020

Choose a reason for hiding this comment

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

retval = ... ? SUCCESS : FAILURE;

Copy link
Member Author

@Girgias Girgias Sep 25, 2020

Choose a reason for hiding this comment

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

That's actually smarter... I don't use ternaries very often lol

}
}

Expand Down