Skip to content

Commit 5b15654

Browse files
arnaud-lbarnaud-lb
committed
Fix tests
1 parent 4e326d2 commit 5b15654

File tree

4 files changed

+55
-35
lines changed

4 files changed

+55
-35
lines changed

‎Zend/tests/zend_ini_parse_quantity_overflow.phpt

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ function decrement(string $s): string {
2828
$tests = [
2929
'No overflow 001' => '0',
3030
'No overflow 002' => '1',
31-
'No overflow 002' => '100',
32-
'No overflow 003' => strval(PHP_INT_MAX),
33-
'No overflow 004' => strval(PHP_INT_MIN),
34-
'No overflow 005' => '2K',
35-
'No overflow 006' => '-2K',
31+
'No overflow 003' => '100',
32+
'No overflow 004' => strval(PHP_INT_MAX),
33+
'No overflow 005' => strval(PHP_INT_MIN),
34+
'No overflow 006' => '2K',
35+
'No overflow 007' => '-2K',
3636
'Subject overflow 001' => increment(strval(PHP_INT_MAX)),
3737
'Subject overflow 002' => decrement(strval(PHP_INT_MIN)),
3838
'Multiplier overflow 001' => strval(PHP_INT_MAX).'K',
@@ -41,45 +41,61 @@ $tests = [
4141

4242
foreach ($tests as $name => $value) {
4343
printf("# %s: \"%s\"\n", $name, $value);
44-
printf("%u\n", zend_test_zend_ini_parse_quantity($value));
44+
printf("%d\n", zend_test_zend_ini_parse_quantity($value));
4545
print "\n";
46+
print "----------\n";
4647
}
4748

4849
--EXPECTF--
4950
# No overflow 001: "0"
5051
0
5152

52-
# No overflow 002: "100"
53+
----------
54+
# No overflow 002: "1"
55+
1
56+
57+
----------
58+
# No overflow 003: "100"
5359
100
5460

55-
# No overflow 003: "%d"
61+
----------
62+
# No overflow 004: "%d"
5663
%d
5764

58-
# No overflow 004: "-%d"
59-
%d
65+
----------
66+
# No overflow 005: "-%d"
67+
-%d
6068

61-
# No overflow 005: "2K"
69+
----------
70+
# No overflow 006: "2K"
6271
2048
6372

64-
# No overflow 006: "-2K"
65-
%d
73+
----------
74+
# No overflow 007: "-2K"
75+
-2048
6676

77+
----------
6778
# Subject overflow 001: "%d"
6879

6980
Warning: Invalid quantity "%d": value is out of range, using overflow result for backwards compatibility in %s on line %d
70-
%d
81+
%s
7182

83+
----------
7284
# Subject overflow 002: "-%d"
7385

7486
Warning: Invalid quantity "-%d": value is out of range, using overflow result for backwards compatibility in %s on line %d
75-
%d
87+
%s
7688

89+
----------
7790
# Multiplier overflow 001: "%dK"
7891

7992
Warning: Invalid quantity "%dK": value is out of range, using overflow result for backwards compatibility in %s on line %d
80-
%d
93+
%s
8194

95+
----------
8296
# Multiplier overflow 002: "-%dK"
8397

8498
Warning: Invalid quantity "-%dK": value is out of range, using overflow result for backwards compatibility in %s on line %d
85-
0
99+
%s
100+
101+
----------

‎Zend/tests/zend_ini_parse_uquantity_overflow.phpt

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ zend_test
88
$tests = [
99
'No overflow 001' => '0',
1010
'No overflow 002' => '1',
11-
'No overflow 002' => '100',
12-
'No overflow 003' => strval(PHP_INT_MAX),
13-
'No overflow 004' => '2K',
14-
'No overflow 005' => '-1',
15-
'No overflow 006' => ' -1',
16-
'No overflow 007' => '-1 ',
17-
'No overflow 008' => ' -1 ',
11+
'No overflow 003' => '100',
12+
'No overflow 004' => strval(PHP_INT_MAX),
13+
'No overflow 005' => '2K',
14+
'No overflow 006' => '-1',
15+
'No overflow 007' => ' -1',
16+
'No overflow 008' => '-1 ',
17+
'No overflow 009' => ' -1 ',
1818
'Subject overflow 001' => base_convert(str_repeat('1', PHP_INT_SIZE*8+1), 2, 10),
1919
'Subject overflow 002' => '-'.base_convert(str_repeat('1', PHP_INT_SIZE*8+1), 2, 10),
2020
'Subject overflow 003' => strval(PHP_INT_MIN),
@@ -27,8 +27,8 @@ $tests = [
2727
foreach ($tests as $name => $value) {
2828
printf("# %s: \"%s\"\n", $name, $value);
2929
printf("%u\n", zend_test_zend_ini_parse_uquantity($value));
30-
echo "\n";
31-
echo "----------\n";
30+
print "\n";
31+
print "----------\n";
3232
}
3333

3434
printf("# zend_test_zend_ini_parse_uquantity(\"-1\") === -1\n");
@@ -39,31 +39,35 @@ var_dump(zend_test_zend_ini_parse_uquantity("-1") === -1);
3939
0
4040

4141
----------
42-
# No overflow 002: "100"
42+
# No overflow 002: "1"
43+
1
44+
45+
----------
46+
# No overflow 003: "100"
4347
100
4448

4549
----------
46-
# No overflow 003: "%d"
50+
# No overflow 004: "%d"
4751
%d
4852

4953
----------
50-
# No overflow 004: "2K"
54+
# No overflow 005: "2K"
5155
2048
5256

5357
----------
54-
# No overflow 005: "-1"
58+
# No overflow 006: "-1"
5559
%d
5660

5761
----------
58-
# No overflow 006: " -1"
62+
# No overflow 007: " -1"
5963
%d
6064

6165
----------
62-
# No overflow 007: "-1 "
66+
# No overflow 008: "-1 "
6367
%d
6468

6569
----------
66-
# No overflow 008: " -1 "
70+
# No overflow 009: " -1 "
6771
%d
6872

6973
----------

‎ext/opcache/tests/bug71843.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER (zend_vm_execute.h:347
33
--INI--
44
opcache.enable=1
55
opcache.enable_cli=1
6-
opcache.optimization_level=0xFFFFBFFF
6+
opcache.optimization_level=0x7FFFBFFF
77
--EXTENSIONS--
88
opcache
99
--FILE--

‎ext/opcache/tests/bug74431.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #74431 - foreach infinite loop
33
--INI--
44
opcache.enable=1
55
opcache.enable_cli=1
6-
opcache.optimization_level=0xffffffff
6+
opcache.optimization_level=0x7fffffff
77
--EXTENSIONS--
88
opcache
99
--FILE--

0 commit comments

Comments
 (0)