mirror of
https://github.com/php/php-src.git
synced 2025-08-15 13:38:49 +02:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix GH-13984: Buffer size is now checked before memcmp (#13991)
This commit is contained in:
commit
dd5cdfd645
3 changed files with 22 additions and 1 deletions
3
NEWS
3
NEWS
|
@ -37,6 +37,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)
|
||||
|
|
|
@ -738,7 +738,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) {
|
||||
|
|
18
ext/pdo_sqlite/tests/gh13991.phpt
Normal file
18
ext/pdo_sqlite/tests/gh13991.phpt
Normal 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!
|
Loading…
Add table
Add a link
Reference in a new issue