Skip to content

zend_atol() cleanup #7788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

zend_atol() cleanup #7788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a8fde
Remove incorrect uses of zend_atol()
arnaud-lb Dec 12, 2021
c582005
zend_atol cleanup
arnaud-lb Dec 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
360 changes: 360 additions & 0 deletions Zend/tests/zend_atol.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,360 @@
--TEST--
Test parsing of INI "size" values (e.g. "16M")
--EXTENSIONS--
zend_test
--FILE--
<?php

// This test checks valid formats do not throw any warnings.
foreach (['', ' '] as $leadingWS) {
foreach (['', '+', '-'] as $sign) {
foreach (['', ' '] as $midWS) {
foreach (['', 'K', 'k', 'M', 'm', 'G', 'g'] as $exp) {
foreach (['', ' '] as $trailingWS) {
$setting = sprintf('%s%s1%s%s%s',
$leadingWS, $sign, $midWS, $exp, $trailingWS);
var_dump($setting);
var_dump(zend_test_zend_atol($setting));
}
}
}
}
}

--EXPECT--
string(1) "1"
int(1)
string(2) "1 "
int(1)
string(2) "1K"
int(1024)
string(3) "1K "
int(1024)
string(2) "1k"
int(1024)
string(3) "1k "
int(1024)
string(2) "1M"
int(1048576)
string(3) "1M "
int(1048576)
string(2) "1m"
int(1048576)
string(3) "1m "
int(1048576)
string(2) "1G"
int(1073741824)
string(3) "1G "
int(1073741824)
string(2) "1g"
int(1073741824)
string(3) "1g "
int(1073741824)
string(2) "1 "
int(1)
string(3) "1 "
int(1)
string(3) "1 K"
int(1024)
string(4) "1 K "
int(1024)
string(3) "1 k"
int(1024)
string(4) "1 k "
int(1024)
string(3) "1 M"
int(1048576)
string(4) "1 M "
int(1048576)
string(3) "1 m"
int(1048576)
string(4) "1 m "
int(1048576)
string(3) "1 G"
int(1073741824)
string(4) "1 G "
int(1073741824)
string(3) "1 g"
int(1073741824)
string(4) "1 g "
int(1073741824)
string(2) "+1"
int(1)
string(3) "+1 "
int(1)
string(3) "+1K"
int(1024)
string(4) "+1K "
int(1024)
string(3) "+1k"
int(1024)
string(4) "+1k "
int(1024)
string(3) "+1M"
int(1048576)
string(4) "+1M "
int(1048576)
string(3) "+1m"
int(1048576)
string(4) "+1m "
int(1048576)
string(3) "+1G"
int(1073741824)
string(4) "+1G "
int(1073741824)
string(3) "+1g"
int(1073741824)
string(4) "+1g "
int(1073741824)
string(3) "+1 "
int(1)
string(4) "+1 "
int(1)
string(4) "+1 K"
int(1024)
string(5) "+1 K "
int(1024)
string(4) "+1 k"
int(1024)
string(5) "+1 k "
int(1024)
string(4) "+1 M"
int(1048576)
string(5) "+1 M "
int(1048576)
string(4) "+1 m"
int(1048576)
string(5) "+1 m "
int(1048576)
string(4) "+1 G"
int(1073741824)
string(5) "+1 G "
int(1073741824)
string(4) "+1 g"
int(1073741824)
string(5) "+1 g "
int(1073741824)
string(2) "-1"
int(-1)
string(3) "-1 "
int(-1)
string(3) "-1K"
int(-1024)
string(4) "-1K "
int(-1024)
string(3) "-1k"
int(-1024)
string(4) "-1k "
int(-1024)
string(3) "-1M"
int(-1048576)
string(4) "-1M "
int(-1048576)
string(3) "-1m"
int(-1048576)
string(4) "-1m "
int(-1048576)
string(3) "-1G"
int(-1073741824)
string(4) "-1G "
int(-1073741824)
string(3) "-1g"
int(-1073741824)
string(4) "-1g "
int(-1073741824)
string(3) "-1 "
int(-1)
string(4) "-1 "
int(-1)
string(4) "-1 K"
int(-1024)
string(5) "-1 K "
int(-1024)
string(4) "-1 k"
int(-1024)
string(5) "-1 k "
int(-1024)
string(4) "-1 M"
int(-1048576)
string(5) "-1 M "
int(-1048576)
string(4) "-1 m"
int(-1048576)
string(5) "-1 m "
int(-1048576)
string(4) "-1 G"
int(-1073741824)
string(5) "-1 G "
int(-1073741824)
string(4) "-1 g"
int(-1073741824)
string(5) "-1 g "
int(-1073741824)
string(2) " 1"
int(1)
string(3) " 1 "
int(1)
string(3) " 1K"
int(1024)
string(4) " 1K "
int(1024)
string(3) " 1k"
int(1024)
string(4) " 1k "
int(1024)
string(3) " 1M"
int(1048576)
string(4) " 1M "
int(1048576)
string(3) " 1m"
int(1048576)
string(4) " 1m "
int(1048576)
string(3) " 1G"
int(1073741824)
string(4) " 1G "
int(1073741824)
string(3) " 1g"
int(1073741824)
string(4) " 1g "
int(1073741824)
string(3) " 1 "
int(1)
string(4) " 1 "
int(1)
string(4) " 1 K"
int(1024)
string(5) " 1 K "
int(1024)
string(4) " 1 k"
int(1024)
string(5) " 1 k "
int(1024)
string(4) " 1 M"
int(1048576)
string(5) " 1 M "
int(1048576)
string(4) " 1 m"
int(1048576)
string(5) " 1 m "
int(1048576)
string(4) " 1 G"
int(1073741824)
string(5) " 1 G "
int(1073741824)
string(4) " 1 g"
int(1073741824)
string(5) " 1 g "
int(1073741824)
string(3) " +1"
int(1)
string(4) " +1 "
int(1)
string(4) " +1K"
int(1024)
string(5) " +1K "
int(1024)
string(4) " +1k"
int(1024)
string(5) " +1k "
int(1024)
string(4) " +1M"
int(1048576)
string(5) " +1M "
int(1048576)
string(4) " +1m"
int(1048576)
string(5) " +1m "
int(1048576)
string(4) " +1G"
int(1073741824)
string(5) " +1G "
int(1073741824)
string(4) " +1g"
int(1073741824)
string(5) " +1g "
int(1073741824)
string(4) " +1 "
int(1)
string(5) " +1 "
int(1)
string(5) " +1 K"
int(1024)
string(6) " +1 K "
int(1024)
string(5) " +1 k"
int(1024)
string(6) " +1 k "
int(1024)
string(5) " +1 M"
int(1048576)
string(6) " +1 M "
int(1048576)
string(5) " +1 m"
int(1048576)
string(6) " +1 m "
int(1048576)
string(5) " +1 G"
int(1073741824)
string(6) " +1 G "
int(1073741824)
string(5) " +1 g"
int(1073741824)
string(6) " +1 g "
int(1073741824)
string(3) " -1"
int(-1)
string(4) " -1 "
int(-1)
string(4) " -1K"
int(-1024)
string(5) " -1K "
int(-1024)
string(4) " -1k"
int(-1024)
string(5) " -1k "
int(-1024)
string(4) " -1M"
int(-1048576)
string(5) " -1M "
int(-1048576)
string(4) " -1m"
int(-1048576)
string(5) " -1m "
int(-1048576)
string(4) " -1G"
int(-1073741824)
string(5) " -1G "
int(-1073741824)
string(4) " -1g"
int(-1073741824)
string(5) " -1g "
int(-1073741824)
string(4) " -1 "
int(-1)
string(5) " -1 "
int(-1)
string(5) " -1 K"
int(-1024)
string(6) " -1 K "
int(-1024)
string(5) " -1 k"
int(-1024)
string(6) " -1 k "
int(-1024)
string(5) " -1 M"
int(-1048576)
string(6) " -1 M "
int(-1048576)
string(5) " -1 m"
int(-1048576)
string(6) " -1 m "
int(-1048576)
string(5) " -1 G"
int(-1073741824)
string(6) " -1 G "
int(-1073741824)
string(5) " -1 g"
int(-1073741824)
string(6) " -1 g "
int(-1073741824)
32 changes: 32 additions & 0 deletions Zend/tests/zend_atol_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
Test parsing failures of INI "size" values (e.g. "16M")
--EXTENSIONS--
zend_test
--FILE--
<?php

// This test checks invalid formats do throw warnings.

$tests = [
'K', # No digits
'1KM', # Multiple multipliers.
'1X', # Unknown multiplier.
'1.0K', # Non integral digits.
];

foreach ($tests as $setting) {
var_dump(zend_test_zend_atol($setting));
}

--EXPECTF--
Warning: Invalid numeric string 'K', no valid leading digits, interpreting as '0' for backwards compatibility in %s%ezend_atol_error.php on line %d
int(0)

Warning: Invalid numeric string '1KM', interpreting as '1M' for backwards compatibility in %s%ezend_atol_error.php on line %d
int(1048576)

Warning: Invalid numeric string '1X', interpreting as '1' for backwards compatibility in %s%ezend_atol_error.php on line %d
int(1)

Warning: Invalid numeric string '1.0K', interpreting as '1K' for backwards compatibility in %s%ezend_atol_error.php on line %d
int(1024)
Loading