Skip to content

Commit 13842ed

Browse files
769344359sgolemon
authored andcommitted
Fixed bug #79468
Close the stream filter resources when removing them from the stream.
1 parent 6df761b commit 13842ed

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ PHP NEWS
33
?? ??? 2020, PHP 7.2.30
44

55
- Standard:
6+
. Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter
7+
appended). (dinosaur)
68
. Fixed bug #79330 (shell_exec() silently truncates after a null byte). (stas)
79
. Fixed bug #79465 (OOB Read in urldecode()). (stas)
810

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--TEST--
2+
Bug #79468 SIGSEGV when closing stream handle with a stream filter appended
3+
--SKIPIF--
4+
<?php
5+
$filters = stream_get_filters();
6+
if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available." );
7+
?>
8+
--FILE--
9+
<?php
10+
$fp = fopen('php://temp', 'rb');
11+
$rot13_filter = stream_filter_append($fp, "string.rot13", STREAM_FILTER_WRITE);
12+
fwrite($fp, "This is ");
13+
fclose($fp);
14+
try {
15+
stream_filter_remove($rot13_filter);
16+
} catch (\Throwable $e) {
17+
var_dump($e->getMessage());
18+
}
19+
?>
20+
--EXPECTF--
21+
Warning: stream_filter_remove(): Invalid resource given, not a stream filter in %s on line %d

main/streams/streams.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,15 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
477477

478478
if (close_options & PHP_STREAM_FREE_RELEASE_STREAM) {
479479
while (stream->readfilters.head) {
480+
if (stream->readfilters.head->res != NULL) {
481+
zend_list_close(stream->readfilters.head->res);
482+
}
480483
php_stream_filter_remove(stream->readfilters.head, 1);
481484
}
482485
while (stream->writefilters.head) {
486+
if (stream->writefilters.head->res != NULL) {
487+
zend_list_close(stream->writefilters.head->res);
488+
}
483489
php_stream_filter_remove(stream->writefilters.head, 1);
484490
}
485491

0 commit comments

Comments
 (0)