clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)
This commit is contained in:
Anatol Belski 2015-06-10 16:41:07 +02:00
commit effbc87ff1
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/pdo_pgsql/pgsql_statement.c
View File

@ -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;
}

54
ext/pdo_pgsql/tests/bug69752.phpt Normal file
View File

@ -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