[php-src] master: Merge branch 'PHP-8.2' into PHP-8.3

From: Date: Sat, 20 Apr 2024 13:52:00 +0000
Subject: [php-src] master: Merge branch 'PHP-8.2' into PHP-8.3
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128177@lists.php.net to get a copy of this message
Author: Saki Takamachi (SakiTakamachi) Date: 2024-04-20T22:34:31+09:00 Commit: https://github.com/php/php-src/commit/43064160c47552114b000e420987db7d469d5db1 Raw diff: https://github.com/php/php-src/commit/43064160c47552114b000e420987db7d469d5db1.diff Merge branch 'PHP-8.2' into PHP-8.3 * PHP-8.2: Fix GH-13998: Manage refcount of agg_context->val correctly (#14004) Changed paths: A ext/pdo_sqlite/tests/gh13998.phpt M NEWS M ext/pdo_sqlite/sqlite_driver.c Diff: diff --git a/NEWS b/NEWS index 082a9af297c40..478ba319ac0eb 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,8 @@ PHP NEWS - PDO SQLite: . Fix GH-13984 (Buffer size is now checked before memcmp). (Saki Takamachi) + . Fix GH-13998 (Manage refcount of agg_context->val correctly). + (Saki Takamachi) - Phar: . Fixed bug GH-13836 (Renaming a file in a Phar to an already existing diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 3af9aed3521f7..c933c34ed1dcd 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -428,7 +428,6 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb, * the context */ if (agg_context) { if (Z_ISUNDEF(retval)) { - zval_ptr_dtor(&agg_context->val); return FAILURE; } zval_ptr_dtor(Z_REFVAL(agg_context->val)); diff --git a/ext/pdo_sqlite/tests/gh13998.phpt b/ext/pdo_sqlite/tests/gh13998.phpt new file mode 100644 index 0000000000000..c87b4acdd214b --- /dev/null +++ b/ext/pdo_sqlite/tests/gh13998.phpt @@ -0,0 +1,25 @@ +--TEST-- +Fix GH-13998: Manage refcount of agg_context->val correctly +--EXTENSIONS-- +pdo_sqlite +--FILE-- +<?php +$step = function () { + throw new Exception(); +}; +$finalize = function () { +}; + +$db = new PDO('sqlite::memory:'); +$db->query('CREATE TABLE test (a int, b int)'); +$stmt = $db->query('INSERT INTO test VALUES (1, 1), (2, 2), (3, 3)'); +$db->sqliteCreateAggregate('S', $step, $finalize, 1); + +try { + $db->query('SELECT S(a) FROM test'); +} catch (Exception $e) { + echo 'done!'; +} +?> +--EXPECT-- +done!

« previous php.cvs (#128177) next »