Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  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:07 +03:00
commit c33ca443ee

View file

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