date: Validate nanoseconds range and normalize negative zero duration

Author: adapik

ext/date/tests/time/duration/serialize.phpt

@@ -46,6 +46,19 @@ try {
     echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
+try {
+    // Nanoseconds that would be truncated to a valid value by a 32-bit conversion (2^32 + 5).
+    unserialize('O:13:"Time\Duration":3:{s:7:"seconds";i:1;s:11:"nanoseconds";i:4294967301;s:8:"negative";b:0;}');
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+// A negative zero duration is normalized to a non-negative one.
+$zero = unserialize('O:13:"Time\Duration":3:{s:7:"seconds";i:0;s:11:"nanoseconds";i:0;s:8:"negative";b:1;}');
+var_dump($zero->negative);
+var_dump(serialize($zero));
+var_dump($zero == Time\Duration::fromSeconds(0));
+
 try {
     Time\Duration::fromSeconds(1, 1)
         ->__unserialize([
@@ -69,3 +82,7 @@ Exception: Invalid serialization data for Time\Duration object
 Exception: Invalid serialization data for Time\Duration object
 Exception: Invalid serialization data for Time\Duration object
 Exception: Invalid serialization data for Time\Duration object
+bool(false)
+string(85) "O:13:"Time\Duration":3:{s:7:"seconds";i:0;s:11:"nanoseconds";i:0;s:8:"negative";b:0;}"
+bool(true)
+Exception: Invalid serialization data for Time\Duration object

ext/date/time_duration.c

@@ -175,8 +175,9 @@ PHP_METHOD(Time_Duration, __unserialize)
 		goto fail;
 	}
 
-	/* Verify that both properties are positive, since the timelib_duration_ctor_static() takes unsigned. */
-	if (Z_LVAL_P(seconds) < 0 || Z_LVAL_P(nanoseconds) < 0) {
+	/* Verify that both properties are non-negative, since the timelib_duration_ctor_static() takes
+	 * unsigned. */
+	if (Z_LVAL_P(seconds) < 0 || Z_LVAL_P(nanoseconds) < 0 || Z_LVAL_P(nanoseconds) >= NANOS_IN_SEC) {
 		goto fail;
 	}
 
@@ -191,6 +192,8 @@ PHP_METHOD(Time_Duration, __unserialize)
 		goto fail;
 	}
 
+	ZVAL_BOOL(negative, duration->duration.negative);
+
 	return;
 
  fail: