diff options
| author | Michael Wallner <mike@php.net> | 2014-04-03 09:08:35 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-04-03 09:08:35 +0200 |
| commit | ba4fddd2daef2e233d552cf0fa740133e7739ef3 (patch) | |
| tree | 9bcecf2806b6a1196b55f0b3b78c5b4e54636eab /ext | |
| parent | 9eb0c634d457245ac99bacf20fc69d0e17cf094a (diff) | |
| parent | 7ab5c593f77b229210a88d436270707f74b22b78 (diff) | |
| download | php-git-ba4fddd2daef2e233d552cf0fa740133e7739ef3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66182 exit in stream filter produces segfault
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/user_filters.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index ef80f2b290..1f745b574a 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); |