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

From: Date: Wed, 17 Apr 2024 23:39:37 +0000
Subject: [php-src] master: Merge branch 'PHP-8.3'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128155@lists.php.net to get a copy of this message
Author: Saki Takamachi (SakiTakamachi) Date: 2024-04-18T08:38:18+09:00 Commit: https://github.com/php/php-src/commit/d14b2085523c74bd9113392d3c0aa44ac49428a6 Raw diff: https://github.com/php/php-src/commit/d14b2085523c74bd9113392d3c0aa44ac49428a6.diff Merge branch 'PHP-8.3' * PHP-8.3: Fix GH-13984: Buffer size is now checked before memcmp (#13991) Changed paths: A ext/pdo_sqlite/tests/gh13991.phpt M ext/pdo_sqlite/sqlite_driver.c Diff: diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 7cd8880b86099..c1dcaa7fc2bca 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -750,7 +750,7 @@ static char *make_filename_safe(const char *filename) } return estrdup(filename); } - if (*filename && memcmp(filename, ":memory:", sizeof(":memory:"))) { + if (*filename && strcmp(filename, ":memory:")) { char *fullpath = expand_filepath(filename, NULL); if (!fullpath) { diff --git a/ext/pdo_sqlite/tests/gh13991.phpt b/ext/pdo_sqlite/tests/gh13991.phpt new file mode 100644 index 0000000000000..fa847f8ba5b42 --- /dev/null +++ b/ext/pdo_sqlite/tests/gh13991.phpt @@ -0,0 +1,18 @@ +--TEST-- +Fix GH-13984: Buffer size is now checked before memcmp +--EXTENSIONS-- +pdo_sqlite +--SKIPIF-- +<?php if (file_exists(getcwd() . '/13991db')) die('skip File "13991db" already exists.'); ?> +--FILE-- +<?php +$dbfile = '13991db'; +$db = new PDO('sqlite:' . $dbfile, null, null, [PDO::ATTR_PERSISTENT => true]); +echo 'done!'; +?> +--CLEAN-- +<?php +@unlink(getcwd() . '/13991db'); +?> +--EXPECT-- +done!

« previous php.cvs (#128155) next »