Skip to content

Commit 4fdb417

Browse files
kamil-tekielakamil-tekiela
committed
Remove unnecessary warnings
1 parent 5c97e8c commit 4fdb417

File tree

3 files changed

+20
-42
lines changed

3 files changed

+20
-42
lines changed

‎ext/mysqlnd/mysqlnd_ps.c

+2
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

-3
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

+18-39
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,7 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet)
491491

492492
DBG_RETURN(PASS);
493493
premature_end:
494-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
495-
php_error_docref(NULL, E_WARNING, "GREET packet %zu bytes shorter than expected",
496-
p - begin - packet->header.size);
494+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "GREET packet is shorter than expected");
497495
DBG_RETURN(FAIL);
498496
}
499497
/* }}} */
@@ -756,9 +754,7 @@ php_mysqlnd_auth_response_read(MYSQLND_CONN_DATA * conn, void * _packet)
756754

757755
DBG_RETURN(PASS);
758756
premature_end:
759-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
760-
php_error_docref(NULL, E_WARNING, "AUTH_RESPONSE packet %zu bytes shorter than expected",
761-
p - begin - packet->header.size);
757+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "AUTH_RESPONSE packet is shorter than expected");
762758
DBG_RETURN(FAIL);
763759
}
764760
/* }}} */
@@ -893,9 +889,7 @@ php_mysqlnd_ok_read(MYSQLND_CONN_DATA * conn, void * _packet)
893889

894890
DBG_RETURN(PASS);
895891
premature_end:
896-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
897-
php_error_docref(NULL, E_WARNING, "OK packet %zu bytes shorter than expected",
898-
p - begin - packet->header.size);
892+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "OK packet is shorter than expected");
899893
DBG_RETURN(FAIL);
900894
}
901895
/* }}} */
@@ -980,9 +974,7 @@ php_mysqlnd_eof_read(MYSQLND_CONN_DATA * conn, void * _packet)
980974

981975
DBG_RETURN(PASS);
982976
premature_end:
983-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
984-
php_error_docref(NULL, E_WARNING, "EOF packet %zu bytes shorter than expected",
985-
p - begin - packet->header.size);
977+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "EOF packet is shorter than expected");
986978
DBG_RETURN(FAIL);
987979
}
988980
/* }}} */
@@ -1067,6 +1059,9 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
10671059
DBG_ENTER("php_mysqlnd_rset_header_read");
10681060

10691061
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)) {
1062+
if (!error_info->error_no) {
1063+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Error reading result set's header");
1064+
}
10701065
DBG_RETURN(FAIL);
10711066
}
10721067
BAIL_IF_NO_MORE_DATA;
@@ -1151,9 +1146,7 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
11511146

11521147
DBG_RETURN(ret);
11531148
premature_end:
1154-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1155-
php_error_docref(NULL, E_WARNING, "RSET_HEADER packet %zu bytes shorter than expected",
1156-
p - begin - packet->header.size);
1149+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "RSET_HEADER packet is shorter than expected");
11571150
DBG_RETURN(FAIL);
11581151
}
11591152
/* }}} */
@@ -1229,8 +1222,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
12291222
DBG_RETURN(PASS);
12301223
} else if (EODATA_MARKER == *p && packet->header.size < 8) {
12311224
/* Premature EOF. That should be COM_FIELD_LIST. But we don't support COM_FIELD_LIST anymore, thus this should not happen */
1232-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1233-
php_error_docref(NULL, E_WARNING, "Premature EOF in result field metadata");
1225+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Premature EOF in result field metadata");
12341226
DBG_RETURN(FAIL);
12351227
}
12361228

@@ -1245,8 +1237,7 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
12451237

12461238
/* 1 byte length */
12471239
if (UNEXPECTED(12 != *p)) {
1248-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1249-
php_error_docref(NULL, E_WARNING, "Protocol error. Server sent false length. Expected 12");
1240+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Protocol error. Server sent false length. Expected 12");
12501241
}
12511242

12521243
if ((size_t)((p - begin) + 12) > packet->header.size) {
@@ -1348,14 +1339,10 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
13481339
DBG_RETURN(PASS);
13491340

13501341
faulty_or_fake:
1351-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1352-
php_error_docref(NULL, E_WARNING, "Protocol error. Server sent NULL_LENGTH."
1353-
" The server is faulty");
1342+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Protocol error. Server sent NULL_LENGTH. The server is faulty");
13541343
DBG_RETURN(FAIL);
13551344
premature_end:
1356-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1357-
php_error_docref(NULL, E_WARNING, "Result set field packet %zu bytes "
1358-
"shorter than expected", p - begin - packet->header.size);
1345+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Result set field packet is shorter than expected");
13591346
DBG_RETURN(FAIL);
13601347
}
13611348
/* }}} */
@@ -1861,9 +1848,9 @@ php_mysqlnd_prepare_read(MYSQLND_CONN_DATA * conn, void * _packet)
18611848

18621849
if (data_size != PREPARE_RESPONSE_SIZE_41 &&
18631850
data_size != PREPARE_RESPONSE_SIZE_50 &&
1864-
!(data_size > PREPARE_RESPONSE_SIZE_50)) {
1851+
data_size <= PREPARE_RESPONSE_SIZE_50) {
18651852
DBG_ERR_FMT("Wrong COM_STMT_PREPARE response size. Received %u", data_size);
1866-
php_error(E_WARNING, "Wrong COM_STMT_PREPARE response size. Received %u", data_size);
1853+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Wrong COM_STMT_PREPARE response size");
18671854
DBG_RETURN(FAIL);
18681855
}
18691856

@@ -1895,9 +1882,7 @@ php_mysqlnd_prepare_read(MYSQLND_CONN_DATA * conn, void * _packet)
18951882

18961883
DBG_RETURN(PASS);
18971884
premature_end:
1898-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1899-
php_error_docref(NULL, E_WARNING, "PREPARE packet %zu bytes shorter than expected",
1900-
p - begin - packet->header.size);
1885+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "PREPARE packet is shorter than expected");
19011886
DBG_RETURN(FAIL);
19021887
}
19031888
/* }}} */
@@ -1965,9 +1950,7 @@ php_mysqlnd_chg_user_read(MYSQLND_CONN_DATA * conn, void * _packet)
19651950

19661951
DBG_RETURN(PASS);
19671952
premature_end:
1968-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
1969-
php_error_docref(NULL, E_WARNING, "CHANGE_USER packet %zu bytes shorter than expected",
1970-
p - begin - packet->header.size);
1953+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "CHANGE_USER packet is shorter than expected");
19711954
DBG_RETURN(FAIL);
19721955
}
19731956
/* }}} */
@@ -2049,9 +2032,7 @@ php_mysqlnd_sha256_pk_request_response_read(MYSQLND_CONN_DATA * conn, void * _pa
20492032
DBG_RETURN(PASS);
20502033

20512034
premature_end:
2052-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
2053-
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet %zu bytes shorter than expected",
2054-
p - begin - packet->header.size);
2035+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "SHA256_PK_REQUEST_RESPONSE packet is shorter than expected");
20552036
DBG_RETURN(FAIL);
20562037
}
20572038
/* }}} */
@@ -2162,9 +2143,7 @@ php_mysqlnd_cached_sha2_result_read(MYSQLND_CONN_DATA * conn, void * _packet)
21622143
DBG_RETURN(PASS);
21632144

21642145
premature_end:
2165-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
2166-
php_error_docref(NULL, E_WARNING, "SHA256_PK_REQUEST_RESPONSE packet %zu bytes shorter than expected",
2167-
p - begin - packet->header.size);
2146+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "SHA256_PK_REQUEST_RESPONSE packet is shorter than expected");
21682147
DBG_RETURN(FAIL);
21692148
}
21702149

0 commit comments

Comments
 (0)