From: Stanislav Malyshev <stas@php.net>
Date: Mon, 9 Mar 2015 05:45:47 +0000 (-0700)
Subject: Merge branch 'pull-request/1106' into PHP-5.5
X-Git-Tag: php-5.5.24RC1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b426fbc4ff6f6274ae579bead669767fe08376;p=php

Merge branch 'pull-request/1106' into PHP-5.5

* pull-request/1106:
  Fix #67626
---

43b426fbc4ff6f6274ae579bead669767fe08376
diff --cc NEWS
index 879ff28030,a0900f0d04..f0ab641d25
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,8 +1,21 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2015, PHP 5.5.23
 +?? ??? 2015, PHP 5.5.24
  
  - Core:
++  . Fixed bug #67626 (User exceptions not properly handled in streams). 
++   (Julian)
 +  . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
 +
 +19 Mar 2015, PHP 5.5.23
 +
 +- Core:
 +  . Fixed bug #69174 (leaks when unused inner class use traits precedence).
 +    (Laruence)
 +  . Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize).
 +    (Laruence)
 +  . Fixed bug #69121 (Segfault in get_current_user when script owner is not
 +    in passwd with ZTS build). (dan at syneto dot net)
    . Fixed bug #65593 (Segfault when calling ob_start from output buffering 
      callback). (Mike)
    . Fixed bug #69017 (Fail to push to the empty array with the constant value
diff --cc main/streams/userspace.c
index ec223534ff,573b46f5db..1732a99e12
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@@ -692,6 -697,12 +697,12 @@@ static size_t php_userstreamop_read(php
  			1, args,
  			0, NULL TSRMLS_CC);
  
+ 	zval_ptr_dtor(&zcount);
+ 
+ 	if (EG(exception)) {
 -		return -1;
++		return 0;
+ 	}
+ 
  	if (call_result == SUCCESS && retval != NULL) {
  		convert_to_string(retval);
  		didread = Z_STRLEN_P(retval);