diff options
| author | Sara Golemon <pollita@php.net> | 2005-03-29 04:02:03 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2005-03-29 04:02:03 +0000 |
| commit | 29ede46872a2d3b79839359a25b2136ca8c92896 (patch) | |
| tree | 9a65836a047417914309da37c878e4df64771098 | |
| parent | 1a356bc40ed6d230a93fc8f32159df03eab0dbc4 (diff) | |
| download | php-git-29ede46872a2d3b79839359a25b2136ca8c92896.tar.gz | |
BugFix #31137 stream_filter_remove() segfaults when stream already closed
| -rw-r--r-- | ext/standard/streamsfuncs.c | 2 | ||||
| -rw-r--r-- | main/streams/filter.c | 5 | ||||
| -rw-r--r-- | main/streams/php_stream_filter_api.h | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 8c04af9e86..7d2a6ed37f 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1097,7 +1097,7 @@ static void apply_filter_to_stream(int append, INTERNAL_FUNCTION_PARAMETERS) } if (filter) { - RETURN_RESOURCE(ZEND_REGISTER_RESOURCE(NULL, filter, php_file_le_stream_filter())); + RETURN_RESOURCE(filter->rsrc_id = ZEND_REGISTER_RESOURCE(NULL, filter, php_file_le_stream_filter())); } else { RETURN_FALSE; } diff --git a/main/streams/filter.c b/main/streams/filter.c index 37ab4c14d5..dc59614888 100644 --- a/main/streams/filter.c +++ b/main/streams/filter.c @@ -499,6 +499,11 @@ PHPAPI php_stream_filter *php_stream_filter_remove(php_stream_filter *filter, in } else { filter->chain->tail = filter->prev; } + + if (filter->rsrc_id > 0) { + zend_list_delete(filter->rsrc_id); + } + if (call_dtor) { php_stream_filter_free(filter TSRMLS_CC); return NULL; diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h index 6ee8192923..115fe2486b 100644 --- a/main/streams/php_stream_filter_api.h +++ b/main/streams/php_stream_filter_api.h @@ -117,6 +117,9 @@ struct _php_stream_filter { /* buffered buckets */ php_stream_bucket_brigade buffer; + + /* filters are auto_registered when they're applied */ + int rsrc_id; }; /* stack filter onto a stream */ |