Merge branch 'PHP-8.2' into PHP-8.3

devnexen · devnexen · commit e32821258e00 · 2024-02-03T13:22:58.000Z
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -238,7 +238,7 @@ static int php_array_key_compare_string_natural_general(Bucket *f, Bucket *s, in
 		l2 = s->key->len;
 	} else {
 		s2 = zend_print_long_to_buf(buf2 + sizeof(buf2) - 1, s->h);
-		l2 = buf2 + sizeof(buf2) - 1 - s1;
+		l2 = buf2 + sizeof(buf2) - 1 - s2;
 	}
 	return strnatcmp_ex(s1, l1, s2, l2, fold_case);
 }

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ static int php_array_key_compare_string_natural_general(Bucket f, Bucket s, in`
`238`	`238`	`l2 = s->key->len;`
`239`	`239`	`} else {`
`240`	`240`	`s2 = zend_print_long_to_buf(buf2 + sizeof(buf2) - 1, s->h);`
`241`		`- l2 = buf2 + sizeof(buf2) - 1 - s1;`
	`241`	`+ l2 = buf2 + sizeof(buf2) - 1 - s2;`
`242`	`242`	`}`
`243`	`243`	`return strnatcmp_ex(s1, l1, s2, l2, fold_case);`
`244`	`244`	`}`