From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 30 Mar 2004 23:58:47 +0000 (+0000)
Subject: Fixed generate_array_diff().
X-Git-Tag: php-5.0.0RC2RC1~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ecdc90763aa5da2ff70531b63fdd7add40cc3d6;p=php

Fixed generate_array_diff().
---

diff --git a/run-tests.php b/run-tests.php
index 026a543051..dbd74eba10 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1039,23 +1039,19 @@ function generate_array_diff($ar1,$ar2,$is_reg,$w)
 		if ($k1 == $l1+1 || $k2 === NULL) {
 			$l1 = $k1;
 			$diff[] = current($old1);
-			next($old1);
-			$k1 = key($old1);
+			$k1 = next($old1) ? key($old1) : NULL;
 		} else if ($k2 == $l2+1 || $k1 === NULL) {
 			$l2 = $k2;
 			$diff[] = current($old2);
-			next($old2);
-			$k2 = key($old2);
+			$k2 = next($old2) ? key($old2) : NULL;
 		} else if ($k1 < $k2) {
 			$l1 = $k1;
 			$diff[] = current($old1);
-			next($old1);
-			$k1 = key($old1);
+			$k1 = next($old1) ? key($old1) : NULL;
 		} else {
 			$l2 = $k2;
 			$diff[] = current($old2);
-			next($old2);
-			$k2 = key($old2);
+			$k2 = next($old2) ? key($old2) : NULL;
 		}
 	}
 	while ($idx1 < $cnt1) {