Skip to content

Commit 6412634

Browse files
kamil-tekielakamil-tekiela
committed
Remove unnecessary warnings
1 parent ac0720f commit 6412634

File tree

3 files changed

+20
-42
lines changed

3 files changed

+20
-42
lines changed

‎ext/mysqlnd/mysqlnd_ps.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ mysqlnd_stmt_read_prepare_response(MYSQLND_STMT * s)
307307
conn->payload_decoder_factory->m.init_prepare_response_packet(&prepare_resp);
308308

309309
if (FAIL == PACKET_READ(conn, &prepare_resp)) {
310+
// There might have been a connection specific error which we must report as a statement error
311+
COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info);
310312
goto done;
311313
}
312314

‎ext/mysqlnd/mysqlnd_result.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s)
183183
UPSERT_STATUS_SET_AFFECTED_ROWS_TO_ERROR(conn->upsert_status);
184184

185185
if (FAIL == (ret = PACKET_READ(conn, &rset_header))) {
186-
if (conn->error_info->error_no != CR_SERVER_GONE_ERROR && conn->error_info->error_no != CR_CLIENT_INTERACTION_TIMEOUT) {
187-
SET_CLIENT_ERROR(conn->error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Error reading result set's header");
188-
}
189186
break;
190187
}
191188

‎ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,7 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet)
468468

469469
DBG_RETURN(PASS);
470470
premature_end:
471-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
472-
php_error_docref(NULL, E_WARNING, "GREET packet %zu bytes shorter than expected",
473-
p - begin - packet->header.size);
471+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "GREET packet is shorter than expected");
474472
DBG_RETURN(FAIL);
475473
}
476474
/* }}} */
@@ -726,9 +724,7 @@ php_mysqlnd_auth_response_read(MYSQLND_CONN_DATA * conn, void * _packet)
726724

727725
DBG_RETURN(PASS);
728726
premature_end:
729-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
730-
php_error_docref(NULL, E_WARNING, "AUTH_RESPONSE packet %zu bytes shorter than expected",
731-
p - begin - packet->header.size);
727+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "AUTH_RESPONSE packet is shorter than expected");
732728
DBG_RETURN(FAIL);
733729
}
734730
/* }}} */
@@ -863,9 +859,7 @@ php_mysqlnd_ok_read(MYSQLND_CONN_DATA * conn, void * _packet)
863859

864860
DBG_RETURN(PASS);
865861
premature_end:
866-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
867-
php_error_docref(NULL, E_WARNING, "OK packet %zu bytes shorter than expected",
868-
p - begin - packet->header.size);
862+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "OK packet is shorter than expected");
869863
DBG_RETURN(FAIL);
870864
}
871865
/* }}} */
@@ -950,9 +944,7 @@ php_mysqlnd_eof_read(MYSQLND_CONN_DATA * conn, void * _packet)
950944

951945
DBG_RETURN(PASS);
952946
premature_end:
953-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
954-
php_error_docref(NULL, E_WARNING, "EOF packet %zu bytes shorter than expected",
955-
p - begin - packet->header.size);
947+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "EOF packet is shorter than expected");
956948
DBG_RETURN(FAIL);
957949
}
958950
/* }}} */
@@ -1037,6 +1029,9 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
10371029
DBG_ENTER("php_mysqlnd_rset_header_read");
10381030

10391031
if (FAIL == mysqlnd_read_packet_header_and_body(&(packet->header), pfc, vio, stats, error_info, connection_state, buf, buf_len, "resultset header", PROT_RSET_HEADER_PACKET)) {
1032+
if (!error_info->error_no) {
1033+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Error reading result set's header");
1034+
}
10401035
DBG_RETURN(FAIL);
10411036
}
10421037
BAIL_IF_NO_MORE_DATA;
@@ -1110,9 +1105,7 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
11101105

11111106
DBG_RETURN(ret);
11121107
premature_end:
1113-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1114-
php_error_docref(NULL, E_WARNING, "RSET_HEADER packet %zu bytes shorter than expected",
1115-
p - begin - packet->header.size);
1108+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "RSET_HEADER packet is shorter than expected");
11161109
DBG_RETURN(FAIL);
11171110
}
11181111
/* }}} */
@@ -1188,8 +1181,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
11881181
DBG_RETURN(PASS);
11891182
} else if (EODATA_MARKER == *p && packet->header.size < 8) {
11901183
/* Premature EOF. That should be COM_FIELD_LIST. But we don't support COM_FIELD_LIST anymore, thus this should not happen */
1191-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1192-
php_error_docref(NULL, E_WARNING, "Premature EOF in result field metadata");
1184+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Premature EOF in result field metadata");
11931185
DBG_RETURN(FAIL);
11941186
}
11951187

@@ -1204,8 +1196,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
12041196

12051197
/* 1 byte length */
12061198
if (UNEXPECTED(12 != *p)) {
1207-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1208-
php_error_docref(NULL, E_WARNING, "Protocol error. Server sent false length. Expected 12");
1199+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Protocol error. Server sent false length. Expected 12");
12091200
}
12101201

12111202
if ((size_t)((p - begin) + 12) > packet->header.size) {
@@ -1314,14 +1305,10 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
13141305
DBG_RETURN(PASS);
13151306

13161307
faulty_or_fake:
1317-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1318-
php_error_docref(NULL, E_WARNING, "Protocol error. Server sent NULL_LENGTH."
1319-
" The server is faulty");
1308+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Protocol error. Server sent NULL_LENGTH. The server is faulty");
13201309
DBG_RETURN(FAIL);
13211310
premature_end:
1322-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1323-
php_error_docref(NULL, E_WARNING, "Result set field packet %zu bytes "
1324-
"shorter than expected", p - begin - packet->header.size);
1311+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Result set field packet is shorter than expected");
13251312
DBG_RETURN(FAIL);
13261313
}
13271314
/* }}} */
@@ -1809,9 +1796,9 @@ php_mysqlnd_prepare_read(MYSQLND_CONN_DATA * conn, void * _packet)
18091796

18101797
if (data_size != PREPARE_RESPONSE_SIZE_41 &&
18111798
data_size != PREPARE_RESPONSE_SIZE_50 &&
1812-
!(data_size > PREPARE_RESPONSE_SIZE_50)) {
1799+
data_size <= PREPARE_RESPONSE_SIZE_50) {
18131800
DBG_ERR_FMT("Wrong COM_STMT_PREPARE response size. Received %u", data_size);
1814-
php_error(E_WARNING, "Wrong COM_STMT_PREPARE response size. Received %u", data_size);
1801+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Wrong COM_STMT_PREPARE response size");
18151802
DBG_RETURN(FAIL);
18161803
}
18171804

@@ -1843,9 +1830,7 @@ php_mysqlnd_prepare_read(MYSQLND_CONN_DATA * conn, void * _packet)
18431830

18441831
DBG_RETURN(PASS);
18451832
premature_end:
1846-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1847-
php_error_docref(NULL, E_WARNING, "PREPARE packet %zu bytes shorter than expected",
1848-
p - begin - packet->header.size);
1833+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "PREPARE packet is shorter than expected");
18491834
DBG_RETURN(FAIL);
18501835
}
18511836
/* }}} */
@@ -1913,9 +1898,7 @@ php_mysqlnd_chg_user_read(MYSQLND_CONN_DATA * conn, void * _packet)
19131898

19141899
DBG_RETURN(PASS);
19151900
premature_end:
1916-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1917-
php_error_docref(NULL, E_WARNING, "CHANGE_USER packet %zu bytes shorter than expected",
1918-
p - begin - packet->header.size);
1901+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "CHANGE_USER packet is shorter than expected");
19191902
DBG_RETURN(FAIL);
19201903
}
19211904
/* }}} */
@@ -1997,9 +1980,7 @@ php_mysqlnd_sha256_pk_request_response_read(MYSQLND_CONN_DATA * conn, void * _pa
19971980
DBG_RETURN(PASS);
19981981

19991982
premature_end:
2000-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
2001-
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet %zu bytes shorter than expected",
2002-
p - begin - packet->header.size);
1983+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "SHA256_PK_REQUEST_RESPONSE packet is shorter than expected");
20031984
DBG_RETURN(FAIL);
20041985
}
20051986
/* }}} */
@@ -2110,9 +2091,7 @@ php_mysqlnd_cached_sha2_result_read(MYSQLND_CONN_DATA * conn, void * _packet)
21102091
DBG_RETURN(PASS);
21112092

21122093
premature_end:
2113-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
2114-
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet %zu bytes shorter than expected",
2115-
p - begin - packet->header.size);
2094+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "SHA256_PK_REQUEST_RESPONSE packet is shorter than expected");
21162095
DBG_RETURN(FAIL);
21172096
}
21182097

0 commit comments

Comments
 (0)