From: Andi Gutmans <andi@php.net>
Date: Sat, 11 Sep 2004 00:23:33 +0000 (+0000)
Subject: - MFH
X-Git-Tag: php-5.0.2RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76d520e9a7b2b090f37972226dc530e39d0ebd0e;p=php

- MFH
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 96217df5b1..3a49d12876 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -183,7 +183,15 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
 	}
 
 
-#define DVAL_TO_LVAL(d, l) (l) = (d) > LONG_MAX ? (unsigned long) (d) : (long) (d)
+#define DVAL_TO_LVAL(d, l) do {                        \
+       if ((d) > LONG_MAX) {                   \
+               l = LONG_MAX;                   \
+       } else if ((d) < LONG_MIN) {            \
+               l = LONG_MIN;                   \
+       } else {                                \
+               l = (d);                        \
+       }                                       \
+} while (0)
 
 #define zendi_convert_to_long(op, holder, result)					\
 	if (op==result) {												\