Skip to content

Commit 6bfe1aa

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Handle incomplete result set metadata more gracefully
2 parents cad6653 + edb9229 commit 6bfe1aa

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,8 +1194,9 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet)
11941194
DBG_RETURN(PASS);
11951195
} else if (EODATA_MARKER == *p && packet->header.size < 8) {
11961196
/* Premature EOF. That should be COM_FIELD_LIST. But we don't support COM_FIELD_LIST anymore, thus this should not happen */
1197-
DBG_INF("Premature EOF. That should be COM_FIELD_LIST");
1198-
DBG_RETURN(PASS);
1197+
DBG_ERR("Premature EOF. That should be COM_FIELD_LIST");
1198+
php_error_docref(NULL, E_WARNING, "Premature EOF in result field metadata");
1199+
DBG_RETURN(FAIL);
11991200
}
12001201

12011202
meta = packet->metadata;

0 commit comments

Comments
 (0)