com php-src: fix memory leak in pdo_pgsql closeCursor ( bug 69752): ext/pdo_pgsql/pgsql_statement .c ext/pdo_pgsql/tests/bug69752.phpt

From: Date: Wed, 10 Jun 2015 14:36:00 +0000
Subject: com php-src: fix memory leak in pdo_pgsql closeCursor ( bug 69752): ext/pdo_pgsql/pgsql_statement .c ext/pdo_pgsql/tests/bug69752.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87195@lists.php.net to get a copy of this message
Commit: 9ba3a4c66ab781763547923d7d8fb15f0962fc63 Author: Philip Hofstetter <phofstetter@sensational.ch> Wed, 3 Jun 2015 14:56:02 +0200 Committer: Anatol Belski <ab@php.net> Wed, 10 Jun 2015 16:36:00 +0200 Parents: f14141aca2eb675c8f5b0dc246ec4f04b0271218 Branches: PHP-5..5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ba3a4c66ab781763547923d7d8fb15f0962fc63 Log: fix memory leak in pdo_pgsql closeCursor (bug 69752) the parent PDO closeCursor method resets the pdo_stmt_t's executed flag which is used by the postgres driver as a flag to check whether to allocate memory for the column data or not. This means that after the parent closeCursor() has been called, the pdo_pgsql driver will allocate a new buffer for the columns, so the existing buffer should be freed when the cursor is being closed. Bugs: https://bugs.php.net/69752 Changed paths: M ext/pdo_pgsql/pgsql_statement.c A ext/pdo_pgsql/tests/bug69752.phpt Diff: diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index f541c86..75c5a4a 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -220,7 +220,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)); } @@ -614,6 +614,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; } diff --git a/ext/pdo_pgsql/tests/bug69752.phpt b/ext/pdo_pgsql/tests/bug69752.phpt new file mode 100644 index 0000000..7d244ec --- /dev/null +++ b/ext/pdo_pgsql/tests/bug69752.phpt @@ -0,0 +1,54 @@ +--TEST-- +PDO PgSQL Bug #69752 (memory leak with closeCursor) +--SKIPIF-- +<?php +if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded'); +require dirname(__FILE__) . '/config.inc'; +require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; +PDOTest::skip(); +?> +--FILE-- +<?php +require dirname(__FILE__) . '/../../.../ext/pdo/tests/pdo_test.inc'; +$pdo = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); + +$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); + +$pdo->beginTransaction(); + +$pdo->exec(" + create table foo ( + id bigserial not null primary key, + field1 text not null, + field2 text not null, + field3 text not null, + field4 int4 not null + ) +"); +$stmt = $pdo->prepare("insert into foo (field1, field2, field3, field4) values (:field1, :field2, :field3, :field4)"); +$max = 1000; +$first_time_usage = null; + +for($i = 0; $i < $max; $i++) { + $data = array( + 'field1' => "field1: $i", + 'field2' => "field2: $i", + 'field3' => "field3: $i", + 'field4' => $i + ); + $stmt->execute($data); + $stmt->closeCursor(); + $usage = intval(memory_get_usage() / 1024); + + if ($first_time_usage === null) $first_time_usage = $usage; + + if ($first_time_usage != $usage){ + printf("Memory Leak Detected: %d != %d\n", $usage, $first_time_usage); + break; + } +} +$pdo->rollBack(); +echo "done\n" +?> +--EXPECTF-- +done

« previous php.cvs (#87195) next »