Merge branch 'PHP-5.4' into PHP-5.5

remicollet · remicollet · commit dc47ec049007 · 2013-02-11T09:13:27.000+01:00
* PHP-5.4:
  Fixed bug #64142 (dval to lval different behavior on ppc64)
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;`