wez Tue May 10 22:02:27 2005 EDT
Modified files:
/php-src/main/streams userspace.c
Log:
fix inverted logic and thus Bug #27508
http://cvs.php.net/diff.php/php-src/main/streams/userspace.c?r1=1.29&r2=1.30&ty=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.29
php-src/main/streams/userspace.c:1.30
--- php-src/main/streams/userspace.c:1.29 Fri Oct 8 10:40:11 2004
+++ php-src/main/streams/userspace.c Tue May 10 22:02:27 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: userspace.c,v 1.29 2004/10/08 14:40:11 chregu Exp $ */
+/* $Id: userspace.c,v 1.30 2005/05/11 02:02:27 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -835,7 +835,7 @@
ZVAL_STRINGL(&func_name, USERSTREAM_EOF,
sizeof(USERSTREAM_EOF)-1, 0);
call_result = call_user_function_ex(NULL, &us->object,
&func_name, &retval, 0, NULL, 0, NULL TSRMLS_CC);
if (call_result == SUCCESS && retval != NULL &&
Z_TYPE_P(retval) == IS_BOOL) {
- ret = Z_LVAL_P(retval) ? PHP_STREAM_OPTION_RETURN_OK :
PHP_STREAM_OPTION_RETURN_ERR;
+ ret = zval_is_true(retval) ?
PHP_STREAM_OPTION_RETURN_ERR : PHP_STREAM_OPTION_RETURN_OK;
} else {
ret = PHP_STREAM_OPTION_RETURN_ERR;
php_error_docref(NULL TSRMLS_CC, E_WARNING,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
