Skip to content

Fix mysqlnd protocol errors #16421

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
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix mysqlnd protocol errors #16421

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cfffbfa
Remove dead code
kamil-tekiela Oct 13, 2024
84e2267
Set client error consistently in case of malformed packet
kamil-tekiela Oct 13, 2024
5c97e8c
Convert warning into a client error
kamil-tekiela Oct 13, 2024
4fdb417
Remove unnecessary warnings
kamil-tekiela Oct 13, 2024
240d885
Replace 3 more warnings with errors
kamil-tekiela Nov 21, 2024
5f09ee6
Add ERROR:
kamil-tekiela Nov 22, 2024
dcf44b6
Convert one more warning and add tests
kamil-tekiela Nov 22, 2024
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
Next Next commit
Remove dead code
  • Loading branch information
@kamil-tekiela
kamil-tekiela committed Nov 21, 2024
commit cfffbfac724d3c4842bc701cf84a5f3adc1d4f50
6 changes: 1 addition & 5 deletions ext/mysqlnd/mysqlnd_wireprotocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2615,7 +2615,7 @@ static enum_func_status
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response)(
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory,
const enum mysqlnd_packet_type ok_packet,
const bool silent,
const bool silent, /* This is a dead parameter */
const enum php_mysqlnd_server_command command,
const bool ignore_upsert_status, /* actually used only by LOAD DATA. COM_QUERY and COM_EXECUTE handle the responses themselves */

Expand All @@ -2638,12 +2638,8 @@ MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response)(
break;
default:
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
php_error_docref(NULL, E_ERROR, "Wrong response packet %u passed to the function", ok_packet);
break;
}
if (!silent && error_info->error_no == CR_MALFORMED_PACKET) {
php_error_docref(NULL, E_WARNING, "Error while reading %s's response packet. PID=%d", mysqlnd_command_to_text[command], getpid());
}
DBG_INF(ret == PASS ? "PASS":"FAIL");
DBG_RETURN(ret);
}
Expand Down