Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
This commit is contained in:
Dmitry Stogov 2017-10-16 19:02:22 +03:00
commit 5d6912d185

View file

@ -2018,8 +2018,10 @@ static int pdo_stmt_do_next_rowset(pdo_stmt_t *stmt)
struct pdo_column_data *cols = stmt->columns; struct pdo_column_data *cols = stmt->columns;
for (i = 0; i < stmt->column_count; i++) { for (i = 0; i < stmt->column_count; i++) {
if (cols[i].name) {
zend_string_release(cols[i].name); zend_string_release(cols[i].name);
} }
}
efree(stmt->columns); efree(stmt->columns);
stmt->columns = NULL; stmt->columns = NULL;
stmt->column_count = 0; stmt->column_count = 0;