diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 16:41:07 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 16:41:07 +0200 |
| commit | effbc87ff1a0b775be1595fe5f14f8969c47ee73 (patch) | |
| tree | aaf2a633167c3264120b0a1dd09ee4bd419336ab /ext/pdo_pgsql/pgsql_statement.c | |
| parent | b1f3403c9815c05fd14bdcc5954e58e25810bf1f (diff) | |
| parent | 9d5ab7e22f7d8af437e95d2bc5ac6e2c46adfa4c (diff) | |
| download | php-git-effbc87ff1a0b775be1595fe5f14f8969c47ee73.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
fix memory leak in pdo_pgsql closeCursor (bug 69752)
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index d9b1790b89..657c386b0c 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -224,7 +224,7 @@ stmt_retry: return 0; } - if (!stmt->executed && !stmt->column_count) { + if (!stmt->executed && (!stmt->column_count || S->cols == NULL)) { stmt->column_count = (int) PQnfields(S->result); S->cols = ecalloc(stmt->column_count, sizeof(pdo_pgsql_column)); } @@ -612,6 +612,12 @@ done: static int pdo_pgsql_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC) { + pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data; + + if (S->cols != NULL){ + efree(S->cols); + S->cols = NULL; + } return 1; } |