Skip to content

Commit edb9229

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Handle incomplete result set metadata more gracefully
2 parents b63ea10 + 9552cf6 commit edb9229

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ PHP NEWS
1616
- MySQLnd:
1717
. Fixed bug #78680 (mysqlnd's mysql_clear_password does not transmit
1818
null-terminated password). (Daniel Black)
19+
. Fixed bug #80713 (SegFault when disabling ATTR_EMULATE_PREPARES and
20+
MySQL 8.0). (Nikita)
1921

2022
- MySQLi:
2123
. Fixed bug #74779 (x() and y() truncating floats to integers). (cmb)

ext/mysqlnd/mysqlnd_wireprotocol.c

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

12111212
meta = packet->metadata;

0 commit comments

Comments
 (0)