diff options
| author | Michael Wallner <mike@php.net> | 2014-04-03 09:07:35 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-04-03 09:07:35 +0200 |
| commit | 7ab5c593f77b229210a88d436270707f74b22b78 (patch) | |
| tree | edce4da95a43022260d0edb21c91446724882eab | |
| parent | 1ec83d44a1601c3560f430e08af9698bf8fb075c (diff) | |
| download | php-git-7ab5c593f77b229210a88d436270707f74b22b78.tar.gz | |
Fix bug #66182 exit in stream filter produces segfault
Unfortunately, a segv caused by exit cannot be tested reliably.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/user_filters.c | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -6,6 +6,7 @@ PHP NEWS . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike) . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace UNIX sockets). (Mike) + . Fixed bug #66182 (exit in stream filter produces segfault). (Mike) - Embed: . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol) diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 29a4c70d34..65127188aa 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -180,6 +180,11 @@ php_stream_filter_status_t userfilter_filter( zval zpropname; int call_result; + /* the userfilter object probably doesn't exist anymore */ + if (CG(unclean_shutdown)) { + return ret; + } + if (FAILURE == zend_hash_find(Z_OBJPROP_P(obj), "stream", sizeof("stream"), (void**)&zstream)) { /* Give the userfilter class a hook back to the stream */ ALLOC_INIT_ZVAL(zstream); |