[php-src] PHP-8.3: Fix GH-13984: Buffer size is now checked before memcmp (#13991)

From: Date: Wed, 17 Apr 2024 23:39:35 +0000
Subject: [php-src] PHP-8.3: Fix GH-13984: Buffer size is now checked before memcmp (#13991)
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128153@lists.php.net to get a copy of this message
Author: Saki Takamachi (SakiTakamachi) Date: 2024-04-18T08:35:50+09:00 Commit: https://github.com/php/php-src/commit/fda91a054301605ac89049c13e2b3aba07e60319 Raw diff: https://github.com/php/php-src/commit/fda91a054301605ac89049c13e2b3aba07e60319.diff Fix GH-13984: Buffer size is now checked before memcmp (#13991) Fixed an issue where a buffer overflow occurred when a string shorter than :memory: was passed as the db name of pdo_sqlite. fixed #13984 closes #13991 Changed paths: A ext/pdo_sqlite/tests/gh13991.phpt M NEWS M ext/pdo_sqlite/sqlite_driver.c Diff: diff --git a/NEWS b/NEWS index 703795dfa1c50..bcff2820ded76 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,9 @@ PHP NEWS . Fixed bug GH-10495 (feof on OpenSSL stream hangs indefinitely). (Jakub Zelenka) +- PDO SQLite: + . Fix GH-13984 (Buffer size is now checked before memcmp). (Saki Takamachi) + - Phar: . Fixed bug GH-13836 (Renaming a file in a Phar to an already existing filename causes a NULL pointer dereference). (nielsdos) diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index de5170a35a96b..2f494c2ddb8b3 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -751,7 +751,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 (#128153) next »