diff options
| author | dinosaur <thedinosaurmail@gmail.com> | 2020-04-14 07:46:34 +0800 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-14 11:59:51 +0200 |
| commit | 95eaccd0bb901495323c36282d4e783556be1964 (patch) | |
| tree | 914749ef290a9a3ad1ef6090506fa2416b36ab2b | |
| parent | 8967588702e707956df1a02055596148fa114a2f (diff) | |
| download | php-git-95eaccd0bb901495323c36282d4e783556be1964.tar.gz | |
Fixed bug #79468
Close the stream filter resources when removing them from the stream.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/standard/tests/filters/bug79468.phpt | 21 | ||||
| -rw-r--r-- | main/streams/streams.c | 6 |
3 files changed, 31 insertions, 0 deletions
@@ -14,6 +14,10 @@ PHP NEWS . Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported). (Girgias) +- Standard: + . Fixed bug #79468 (SIGSEGV when closing stream handle with a stream filter + appended). (dinosaur) + 16 Apr 2020, PHP 7.3.17 - Core: diff --git a/ext/standard/tests/filters/bug79468.phpt b/ext/standard/tests/filters/bug79468.phpt new file mode 100644 index 0000000000..60a848ec01 --- /dev/null +++ b/ext/standard/tests/filters/bug79468.phpt @@ -0,0 +1,21 @@ +--TEST-- +Bug #79468 SIGSEGV when closing stream handle with a stream filter appended +--SKIPIF-- +<?php +$filters = stream_get_filters(); +if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available." ); +?> +--FILE-- +<?php +$fp = fopen('php://temp', 'rb'); +$rot13_filter = stream_filter_append($fp, "string.rot13", STREAM_FILTER_WRITE); +fwrite($fp, "This is "); +fclose($fp); +try { + stream_filter_remove($rot13_filter); +} catch (\Throwable $e) { + var_dump($e->getMessage()); +} +?> +--EXPECTF-- +Warning: stream_filter_remove(): Invalid resource given, not a stream filter in %s on line %d diff --git a/main/streams/streams.c b/main/streams/streams.c index 5daf4fe83d..fb9c680073 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -476,9 +476,15 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov if (close_options & PHP_STREAM_FREE_RELEASE_STREAM) { while (stream->readfilters.head) { + if (stream->readfilters.head->res != NULL) { + zend_list_close(stream->readfilters.head->res); + } php_stream_filter_remove(stream->readfilters.head, 1); } while (stream->writefilters.head) { + if (stream->writefilters.head->res != NULL) { + zend_list_close(stream->writefilters.head->res); + } php_stream_filter_remove(stream->writefilters.head, 1); } |