diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 16:43:33 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 16:43:33 +0200 |
| commit | 8ad5111d1cd91be56955b01922fc7d3f02622fe6 (patch) | |
| tree | dab26960f43d58b41509b8a68b722475630cd39a /ext/pdo_pgsql/pgsql_statement.c | |
| parent | 45521b08b8693b7b6b4a9c521287232f3a16f048 (diff) | |
| parent | 2b0a19f4ed0201973dd4b1369856d48e58da3808 (diff) | |
| download | php-git-8ad5111d1cd91be56955b01922fc7d3f02622fe6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
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 60553b36ce..835c4dd97d 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)); } @@ -618,6 +618,12 @@ done: static int pdo_pgsql_stmt_cursor_closer(pdo_stmt_t *stmt) { + pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data; + + if (S->cols != NULL){ + efree(S->cols); + S->cols = NULL; + } return 1; } |