diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-16 19:02:22 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-16 19:02:22 +0300 |
| commit | 5d6912d185f8bdf6b25f95255cc653f0048da4f0 (patch) | |
| tree | fe2e7a7a700c4f6d10332e4befce4794e773258c | |
| parent | 6fab62e923383ac2ca9b24a8432f3eb668a1687c (diff) | |
| parent | c33ca443eefead6d9db29ca534c6f5b87cc31f1e (diff) | |
| download | php-git-5d6912d185f8bdf6b25f95255cc653f0048da4f0.tar.gz | |
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
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index caf3ff1ef4..4f3d4cedb5 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2018,7 +2018,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; |