com php-src: Fixed segafult while stream is referenced by persistent resource (like dba): main/streams/streams.c

From: Date: Wed, 21 May 2014 05:11:56 +0000
Subject: com php-src: Fixed segafult while stream is referenced by persistent resource (like dba): main/streams/streams.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78486@lists.php.net to get a copy of this message
Commit: 59d74db108a458d08792c59f8e92677ce8c41423 Author: Xinchen Hui <laruence@php.net> Wed, 21 May 2014 13:11:56 +0800 Parents: 96617874bd5d9872dde39488bc272385764ff8e2 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59d74db108a458d08792c59f8e92677ce8c41423 Log: Fixed segafult while stream is referenced by persistent resource (like dba) Changed paths: M main/streams/streams.c Diff: diff --git a/main/streams/streams.c b/main/streams/streams.c index c754bdc..3ed4573 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -457,7 +457,7 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov _php_stream_flush(stream, 1 TSRMLS_CC); /* If not called from the resource dtor, remove the stream from the resource list. */ - if ((close_options & PHP_STREAM_FREE_RSRC_DTOR) == 0) { + if ((close_options & PHP_STREAM_FREE_RSRC_DTOR) == 0 && stream->res) { /* zend_list_delete actually only decreases the refcount; if we're * releasing the stream, we want to actually delete the resource from * the resource list, otherwise the resource will point to invalid memory.

« previous php.cvs (#78486) next »