diff options
| author | Marcus Boerger <helly@php.net> | 2003-06-14 19:30:42 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-06-14 19:30:42 +0000 |
| commit | f304458bdb78d19bd5da94a04abafc2602d60cdd (patch) | |
| tree | d8cbeb454f76100a735a871f0149340ae5fe2483 /main/streams/streams.c | |
| parent | 8f2b387c6147375501ad6de814bede9357fa4cf8 (diff) | |
| download | php-git-f304458bdb78d19bd5da94a04abafc2602d60cdd.tar.gz | |
Fix ZTS mode (hopefully all is working fine now again)
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index b396a260b2..f35b401b0d 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -413,7 +413,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D size_t justread = 0; int flags; php_stream_bucket *bucket; - php_stream_filter_status_t status; + php_stream_filter_status_t status = PSFS_ERR_FATAL; php_stream_filter *filter; /* read a chunk into a bucket */ @@ -893,7 +893,7 @@ static size_t _php_stream_write_filtered(php_stream *stream, const char *buf, si php_stream_bucket *bucket; php_stream_bucket_brigade brig_in = { NULL, NULL }, brig_out = { NULL, NULL }; php_stream_bucket_brigade *brig_inp = &brig_in, *brig_outp = &brig_out, *brig_swap; - php_stream_filter_status_t status; + php_stream_filter_status_t status = PSFS_ERR_FATAL; php_stream_filter *filter; if (buf) { @@ -1618,7 +1618,10 @@ PHPAPI void php_stream_notification_notify(php_stream_context *context, int noti PHPAPI void php_stream_context_free(php_stream_context *context) { - zval_ptr_dtor(&context->options); + if (context->options) { + zval_ptr_dtor(&context->options); + context->options = NULL; + } efree(context); } |