mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-07 17:27:30 +00:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix bug #66182 exit in stream filter produces segfault
This commit is contained in:
commit
ba4fddd2da
1 file changed
+5
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user