diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-16 15:35:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-16 15:35:01 +0100 |
| commit | 6bfe1aa19a17e9b9991d31dfcb629fa845fb37c1 (patch) | |
| tree | b14678e2146c0ab7681a8bd5ad53f18b96cac365 /ext | |
| parent | cad66533f0cb936154caca6e6857a3490887cc11 (diff) | |
| parent | edb9229b8bb653cac964a3cc33b26895a42089e6 (diff) | |
| download | php-git-6bfe1aa19a17e9b9991d31dfcb629fa845fb37c1.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Handle incomplete result set metadata more gracefully
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 252fc0e8fc..9b2651b0a2 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1194,8 +1194,9 @@ php_mysqlnd_rset_field_read(MYSQLND_CONN_DATA * conn, void * _packet) DBG_RETURN(PASS); } else if (EODATA_MARKER == *p && packet->header.size < 8) { /* Premature EOF. That should be COM_FIELD_LIST. But we don't support COM_FIELD_LIST anymore, thus this should not happen */ - DBG_INF("Premature EOF. That should be COM_FIELD_LIST"); - DBG_RETURN(PASS); + DBG_ERR("Premature EOF. That should be COM_FIELD_LIST"); + php_error_docref(NULL, E_WARNING, "Premature EOF in result field metadata"); + DBG_RETURN(FAIL); } meta = packet->metadata; |