Fixed bug #64142 (dval to lval different behavior on ppc64)

remicollet · remicollet · commit e67a2b9e471a · 2013-02-11T09:10:51.000+01:00
See discussion on internals http://marc.info/?t=136042277700003&r=1&w=2
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2012, PHP 5.4.13
 
+- Core:
+  . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
+
 - CLI server:
   . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)
 
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -79,7 +79,8 @@ static zend_always_inline long zend_dval_to_lval(double d)
 #else
 static zend_always_inline long zend_dval_to_lval(double d)
 {
-	if (d > LONG_MAX) {
+	/* >= as (double)LONG_MAX is outside signed range */
+	if (d >= LONG_MAX) {
 		return (long)(unsigned long) d;
 	}
 	return (long) d;

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ static zend_always_inline long zend_dval_to_lval(double d)`
`79`	`79`	`#else`
`80`	`80`	`static zend_always_inline long zend_dval_to_lval(double d)`
`81`	`81`	`{`
`82`		`- if (d > LONG_MAX) {`
	`82`	`+ /* >= as (double)LONG_MAX is outside signed range */`
	`83`	`+ if (d >= LONG_MAX) {`
`83`	`84`	`return (long)(unsigned long) d;`
`84`	`85`	`}`
`85`	`86`	`return (long) d;`