cvs: ZendEngine2(PHP_5_0) / zend_operators.c php-src NEWS
| From: | Ilia Alshanetsky | Date: | Tue, 26 Oct 2004 22:40:51 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_0) / zend_operators.c php-src NEWS | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-3107@lists.php.net to get a copy of this message | ||
iliaa Tue Oct 26 18:40:51 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/ZendEngine2 zend_operators.c
Log:
MFH: Fixed bug #30572 (crash when comparing SimpleXML attribute to a boolean).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.107&r2=1.1760.2.108&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.107 php-src/NEWS:1.1760.2.108
--- php-src/NEWS:1.1760.2.107 Tue Oct 26 05:32:01 2004
+++ php-src/NEWS Tue Oct 26 18:40:51 2004
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5.0.3
- Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #30572 (crash when comparing SimpleXML attribute to a boolean).
+ (Ilia)
- Fixed bug #30475 (curl_getinfo() may crash in some situations). (Ilia)
- Fixed bug #30442 (segfault when parsing ?getvariable[][ ). (Tony)
- Fixed bug #30387 (stream_socket_client async connect was broken).
http://cvs.php.net/diff.php/ZendEngine2/zend_operators.c?r1=1.193.2.4&r2=1.193.2.5&ty=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.193.2.4 ZendEngine2/zend_operators.c:1.193.2.5
--- ZendEngine2/zend_operators.c:1.193.2.4 Wed Oct 20 15:33:35 2004
+++ ZendEngine2/zend_operators.c Tue Oct 26 18:40:51 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.193.2.4 2004/10/20 19:33:35 andi Exp $ */
+/* $Id: zend_operators.c,v 1.193.2.5 2004/10/26 22:40:51 iliaa Exp $ */
#include <ctype.h>
@@ -1330,7 +1330,11 @@
if (op1->type == IS_BOOL || op2->type == IS_BOOL
|| op1->type == IS_NULL || op2->type == IS_NULL) {
- zendi_convert_to_boolean(op1, op1_copy, result);
+ if (free_op1) {
+ convert_to_boolean(op1);
+ } else {
+ zendi_convert_to_boolean(op1, op1_copy, result);
+ }
zendi_convert_to_boolean(op2, op2_copy, result);
result->type = IS_LONG;
result->value.lval = ZEND_NORMALIZE_BOOL(op1->value.lval-op2->value.lval);