diff options
| author | Anatol Belski <ab@php.net> | 2018-07-30 18:28:53 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-07-30 18:28:53 +0200 |
| commit | d207d6a57f17a6562e05ce954079341f353c6660 (patch) | |
| tree | 199f990766382acd1094b91cf6934b15db8733f5 /ext/pdo_pgsql/pgsql_statement.c | |
| parent | ce66492a1353b2aab80529f7b3ca967694d83a7e (diff) | |
| parent | cc69950b1527b321bf54a9394938d57e8f5a35cc (diff) | |
| download | php-git-d207d6a57f17a6562e05ce954079341f353c6660.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75402 Possible Memory Leak using PDO::CURSOR_SCROLL option
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index b401917669..a9df2a97bf 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -165,6 +165,7 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt) pdo_pgsql_error_stmt(stmt, status, pdo_pgsql_sqlstate(S->result)); return 0; } + PQclear(S->result); /* the cursor was declared correctly */ S->is_prepared = 1; @@ -434,6 +435,11 @@ static int pgsql_stmt_fetch(pdo_stmt_t *stmt, return 0; } + if(S->result) { + PQclear(S->result); + S->result = NULL; + } + spprintf(&q, 0, "FETCH %s FROM %s", ori_str, S->cursor_name); efree(ori_str); S->result = PQexec(S->H->server, q); |