Fix bug #81343: inconsistent type conversion after closeCursor

pilif · nikic · commit ace8fba759f5 · 2021-08-11T18:24:13.000+02:00
S->cols is already freed in the statement destructor and since caa7100 the column data is only populated on the first execute() which means that on subsequent execute()s after closeCursor was called, all meta-data for column types was removed and never restored Closes GH-7355.
diff --git a/NEWS b/NEWS
@@ -23,6 +23,10 @@ PHP                                                                        NEWS
   . Fixed bug #81349 (mb_detect_encoding misdetcts ASCII in some cases).
     (Nikita)
 
+- PDO PgSQL:
+  . Fixed bug #81343 (pdo_pgsql: Inconsitent boolean conversion after calling
+    closeCursor()). (Philip Hofstetter)
+
 - Phar:
   . Use SHA256 by default for signature. (remi)
   . Add support for OpenSSL_SHA256 and OpenSSL_SHA512 signature. (remi)
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
@@ -240,8 +240,8 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt)
 		return 0;
 	}
 
-	if (!stmt->executed && (!stmt->column_count || S->cols == NULL)) {
-		stmt->column_count = (int) PQnfields(S->result);
+	stmt->column_count = (int) PQnfields(S->result);
+	if (S->cols == NULL) {
 		S->cols = ecalloc(stmt->column_count, sizeof(pdo_pgsql_column));
 	}
 
@@ -674,12 +674,6 @@ static int pgsql_stmt_get_column_meta(pdo_stmt_t *stmt, zend_long colno, zval *r
 
 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;
 }
 
diff --git a/ext/pdo_pgsql/tests/bug81343.phpt b/ext/pdo_pgsql/tests/bug81343.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #81343 pdo_pgsql: Inconsitent boolean conversion after calling closeCursor()
+--EXTENSIONS--
+pdo
+pdo_pgsql
+--SKIPIF--
+<?php
+require __DIR__ . '/config.inc';
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+$pdo = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$pdo->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
+$sth = $pdo->prepare("select false where 2=?");
+
+for ($i = 0; $i < 2; $i++) {
+    $sth->execute([2]);
+    var_dump($sth->fetchColumn(0));
+    $sth->closeCursor();
+}
+?>
+--EXPECT--
+bool(false)
+bool(false)

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt)`
`240`	`240`	`return 0;`
`241`	`241`	`}`
`242`	`242`
`243`		`- if (!stmt->executed && (!stmt->column_count \|\| S->cols == NULL)) {`
`244`		`- stmt->column_count = (int) PQnfields(S->result);`
	`243`	`+ stmt->column_count = (int) PQnfields(S->result);`
	`244`	`+ if (S->cols == NULL) {`
`245`	`245`	`S->cols = ecalloc(stmt->column_count, sizeof(pdo_pgsql_column));`
`246`	`246`	`}`
`247`	`247`
`@@ -674,12 +674,6 @@ static int pgsql_stmt_get_column_meta(pdo_stmt_t stmt, zend_long colno, zval r`
`674`	`674`
`675`	`675`	`static int pdo_pgsql_stmt_cursor_closer(pdo_stmt_t *stmt)`
`676`	`676`	`{`
`677`		`- pdo_pgsql_stmt S = (pdo_pgsql_stmt)stmt->driver_data;`
`678`		`-`
`679`		`- if (S->cols != NULL){`
`680`		`- efree(S->cols);`
`681`		`- S->cols = NULL;`
`682`		`- }`
`683`	`677`	`return 1;`
`684`	`678`	`}`
`685`	`679`