archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  Fix GH-13984: Buffer size is now checked before memcmp (#13991)
This commit is contained in:
Saki Takamachi 2024-04-18 08:38:18 +09:00
commit d14b208552
No known key found for this signature in database
GPG key ID: E4A36F6D37931A8B
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/pdo_sqlite/sqlite_driver.c
View file

@ -750,7 +750,7 @@ static char *make_filename_safe(const char *filename)
} }
return estrdup(filename); return estrdup(filename);
} }
if (*filename && memcmp(filename, ":memory:", sizeof(":memory:"))) { if (*filename && strcmp(filename, ":memory:")) {
char *fullpath = expand_filepath(filename, NULL); char *fullpath = expand_filepath(filename, NULL);
if (!fullpath) { if (!fullpath) {

18
ext/pdo_sqlite/tests/gh13991.phpt Normal file
View file

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