archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source
This commit is contained in:
David Carlier 2025-04-02 12:36:08 +01:00
commit dc93f28381
No known key found for this signature in database
GPG key ID: 2FB76A8CE6CD2B41
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/standard/tests/file/gh18212.phpt Normal file
View file

@ -0,0 +1,13 @@
--TEST--
GH-18212: fseek with SEEK_CUR and negative offset leads to negative file stream position.
--FILE--
<?php
$fp = fopen('php://input', 'r+');
var_dump(fseek($fp, -1, SEEK_SET));
var_dump(fseek($fp, -32, SEEK_CUR));
fclose($fp);
?>
--EXPECT--
int(-1)
int(-1)

2
ext/standard/tests/file/stream_rfc2397_007.phpt
View file

@ -118,7 +118,7 @@ int(2)
bool(false) bool(false)
===S:-10,C=== ===S:-10,C===
int(-1) int(-1)
bool(false) int(2)
bool(false) bool(false)
===S:3,S=== ===S:3,S===
int(0) int(0)

4
main/streams/streams.c
View file

@ -1390,6 +1390,10 @@ PHPAPI int _php_stream_seek(php_stream *stream, zend_off_t offset, int whence)
} }
whence = SEEK_SET; whence = SEEK_SET;
break; break;
case SEEK_SET:
if (offset < 0) {
return -1;
}
} }
ret = stream->ops->seek(stream, offset, whence, &stream->position); ret = stream->ops->seek(stream, offset, whence, &stream->position);