com php-src: Merge branch 'PHP-5.6': ext/pdo_pgsql/pgsql_st atement.c
| From: | Anatol Belski | Date: | Wed, 10 Jun 2015 14:43:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/pdo_pgsql/pgsql_st atement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87197@lists.php.net to get a copy of this message | ||
Commit: 8ad5111d1cd91be56955b01922fc7d3f02622fe6
Author: Anatol Belski <ab@php.net> Wed, 10 Jun 2015 16:43:33 +0200
Parents: 45521b08b8693b7b6b4a9c521287232f3a16f048 2b0a19f4ed0201973dd4b1369856d48e58da3808
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8ad5111d1cd91be56955b01922fc7d3f02622fe6
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
fix memory leak in pdo_pgsql closeCursor (bug 69752)
Bugs:
https://bugs.php.net/69752
Changed paths:
MM ext/pdo_pgsql/pgsql_statement.c
Diff:
diff --cc ext/pdo_pgsql/pgsql_statement.c
index 60553b3,657c386..835c4dd
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@@ -616,8 -610,14 +616,14 @@@ done
return 1;
}
-static int pdo_pgsql_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
+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;
}