Handle negative zero

Author: TysonAndre

ext/spl/spl_fixedarray.c

@@ -212,10 +212,16 @@ static zend_bool spl_fixedarray_shallow_identical(zval *v1, zval *v2)
 		case IS_LONG:
 			return Z_LVAL_P(v1) == Z_LVAL_P(v2);
 		case IS_DOUBLE: {
+			uint64_t raw1 = *(uint64_t *)(&v1->value);
+			uint64_t raw2 = *(uint64_t *)(&v2->value);
+			if (EXPECTED(raw1 == raw2)) {
+				/* Same bit representation, e.g. for ordinary numbers or positive/negative zero. */
+				return true;
+			}
 			double d1 = Z_DVAL_P(v1);
 			double d2 = Z_DVAL_P(v2);
 			/* Also check for NAN */
-			return d1 == d2 || (d1 != d1 && d2 != d2);
+			return (d1 != d1 && d2 != d2);
 		}
 		case IS_STRING:
 			return Z_STR_P(v1) == Z_STR_P(v2); /* Same pointer */

ext/spl/tests/fixedarray_023.phpt

@@ -3,29 +3,34 @@ SPL: FixedArray: Infinite loop in var_export bugfix
 --FILE--
 <?php
 call_user_func(function () {
-    $x = new SplFixedArray(3);
+    $x = new SplFixedArray(4);
     $x[0] = NAN; // Test NAN just in case this check is incorrectly refactored to use zend_is_identical
-    $x[1] = $x;
+    $x[1] = 0.0;
     $x[2] = $x;
+    $x[3] = $x;
     var_export($x);
     echo "\n";
+    $x[1] = -0.0;
     debug_zval_dump($x);
 });
 ?>
 --EXPECTF--
-Warning: var_export does not handle circular references in %s on line 7
+Warning: var_export does not handle circular references in %s on line 8
 
-Warning: var_export does not handle circular references in %s on line 7
+Warning: var_export does not handle circular references in %s on line 8
 SplFixedArray::__set_state(array(
    0 => NAN,
-   1 => NULL,
+   1 => 0.0,
    2 => NULL,
+   3 => NULL,
 ))
-object(SplFixedArray)#2 (3) refcount(6){
+object(SplFixedArray)#2 (4) refcount(6){
   [0]=>
   float(NAN)
   [1]=>
-  *RECURSION*
+  float(-0)
   [2]=>
   *RECURSION*
-}
+  [3]=>
+  *RECURSION*
+}