Browse Source

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66182 	exit in stream filter produces segfault
pull/643/head
Michael Wallner 12 years ago
parent
commit
ba4fddd2da
  1. 5
      ext/standard/user_filters.c

5
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);

Loading…
Cancel
Save