From: Andi Gutmans <andi@php.net>
Date: Wed, 27 Oct 2004 18:15:03 +0000 (+0000)
Subject: - Revert   Fixed bug #30228 (crash when comparing SimpleXML attribute to a boolean).
X-Git-Tag: RELEASE_0_2~820
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4dff681c8b212ec14aab31f7a4365c6b190f42f;p=php

- Revert   Fixed bug #30228 (crash when comparing SimpleXML attribute to a boolean).
- Need to discuss where the real problem is.
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 893d3b6858..4fea659469 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1323,11 +1323,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 	
 	if (op1->type == IS_BOOL || op2->type == IS_BOOL
 		|| op1->type == IS_NULL || op2->type == IS_NULL) {
-		if (free_op1) {
-			convert_to_boolean(op1);
-		} else {
-			zendi_convert_to_boolean(op1, op1_copy, result);
-		}
+		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);