Commit efcfd55
committed
Fix GH-21700: Assertion failure in _php_stream_seek with user stream returning negative position
Validate that stream->position remains non-negative after a user stream's
seek operation. Some user streams may report success from stream_seek()
while their stream_tell() returns a negative value, leaving stream->position
in an invalid state and triggering ZEND_ASSERT(stream->position >= 0) on
the next SEEK_CUR.
Also reject SEEK_CUR seeks whose absolute target would be negative
(reusing the existing SEEK_SET negative-offset rejection via fall-through),
so the user seek hook is not even invoked in that case.
On invalid post-seek position, restore stream->position to its prior value
and return -1, matching the POSIX fseek() contract that the file-position
indicator is unchanged on failure.1 parent 1462499 commit efcfd55
3 files changed
Lines changed: 64 additions & 4 deletions
File tree
- ext/standard/tests/streams
- main/streams
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
195 | 195 | | |
196 | 196 | | |
197 | 197 | | |
| 198 | + | |
| 199 | + | |
198 | 200 | | |
199 | 201 | | |
200 | 202 | | |
| |||
Lines changed: 46 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1466 | 1466 | | |
1467 | 1467 | | |
1468 | 1468 | | |
1469 | | - | |
1470 | | - | |
| 1469 | + | |
| 1470 | + | |
1471 | 1471 | | |
1472 | 1472 | | |
1473 | 1473 | | |
1474 | 1474 | | |
| 1475 | + | |
1475 | 1476 | | |
| 1477 | + | |
1476 | 1478 | | |
1477 | 1479 | | |
1478 | 1480 | | |
1479 | 1481 | | |
1480 | | - | |
1481 | | - | |
| 1482 | + | |
| 1483 | + | |
| 1484 | + | |
| 1485 | + | |
| 1486 | + | |
| 1487 | + | |
| 1488 | + | |
| 1489 | + | |
| 1490 | + | |
| 1491 | + | |
| 1492 | + | |
| 1493 | + | |
1482 | 1494 | | |
1483 | 1495 | | |
1484 | 1496 | | |
| |||
0 commit comments