Remove incorrect uses of zend_atoi()

nikic · nikic · commit 989205e95cde · 2021-07-12T16:56:00.000+02:00
zend_atoi() parses integers with size suffixes (like "128M").
These just want to use a plain number, so use ZEND_ATOL instead.
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -896,7 +896,7 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 	{
 		char *tmp = getenv("USE_ZEND_DTRACE");
 
-		if (tmp && zend_atoi(tmp, 0)) {
+		if (tmp && ZEND_ATOL(tmp)) {
 			zend_dtrace_enabled = 1;
 			zend_compile_file = dtrace_compile_file;
 			zend_execute_ex = dtrace_execute_ex;
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2801,8 +2801,8 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
 
 #if ZEND_MM_CUSTOM
 	tmp = getenv("USE_ZEND_ALLOC");
-	if (tmp && !zend_atoi(tmp, 0)) {
-		bool tracked = (tmp = getenv("USE_TRACKED_ALLOC")) && zend_atoi(tmp, 0);
+	if (tmp && ZEND_ATOL(tmp)) {
+		bool tracked = (tmp = getenv("USE_TRACKED_ALLOC")) && ZEND_ATOL(tmp);
 		zend_mm_heap *mm_heap = alloc_globals->mm_heap = malloc(sizeof(zend_mm_heap));
 		memset(mm_heap, 0, sizeof(zend_mm_heap));
 		mm_heap->use_custom_heap = ZEND_MM_CUSTOM_HEAP_STD;
@@ -2827,7 +2827,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
 #endif
 
 	tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES");
-	if (tmp && zend_atoi(tmp, 0)) {
+	if (tmp && ZEND_ATOL(tmp)) {
 		zend_mm_use_huge_pages = 1;
 	}
 	alloc_globals->mm_heap = zend_mm_init();
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -769,8 +769,7 @@ static PHP_INI_MH(OnUpdateLazyWrite) /* {{{ */
 
 static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */
 {
-	int tmp;
-	tmp = zend_atoi(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
+	int tmp = ZEND_ATOL(ZSTR_VAL(new_value));
 	if(tmp < 0) {
 		php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be greater than or equal to 0");
 		return FAILURE;
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
@@ -1196,7 +1196,7 @@ int main(int argc, char *argv[])
 #if defined(PHP_WIN32) && defined(_DEBUG)
 	{
 		char *tmp = getenv("PHP_WIN32_DEBUG_HEAP");
-		if (tmp && zend_atoi(tmp, 0)) {
+		if (tmp && ZEND_ATOL(tmp, 0)) {
 			int tmp_flag;
 			_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
 			_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ void zend_startup(zend_utility_functions utility_functions) / {{{ */`
`896`	`896`	`{`
`897`	`897`	`char *tmp = getenv("USE_ZEND_DTRACE");`
`898`	`898`
`899`		`- if (tmp && zend_atoi(tmp, 0)) {`
	`899`	`+ if (tmp && ZEND_ATOL(tmp)) {`
`900`	`900`	`zend_dtrace_enabled = 1;`
`901`	`901`	`zend_compile_file = dtrace_compile_file;`
`902`	`902`	`zend_execute_ex = dtrace_execute_ex;`
Original file line number	Diff line number	Diff line change
`@@ -769,8 +769,7 @@ static PHP_INI_MH(OnUpdateLazyWrite) /* {{{ */`
`769`	`769`
`770`	`770`	`static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */`
`771`	`771`	`{`
`772`		`- int tmp;`
`773`		`- tmp = zend_atoi(ZSTR_VAL(new_value), ZSTR_LEN(new_value));`
	`772`	`+ int tmp = ZEND_ATOL(ZSTR_VAL(new_value));`
`774`	`773`	`if(tmp < 0) {`
`775`	`774`	`php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be greater than or equal to 0");`
`776`	`775`	`return FAILURE;`
Original file line number	Diff line number	Diff line change
`@@ -1196,7 +1196,7 @@ int main(int argc, char *argv[])`
`1196`	`1196`	`#if defined(PHP_WIN32) && defined(_DEBUG)`
`1197`	`1197`	`{`
`1198`	`1198`	`char *tmp = getenv("PHP_WIN32_DEBUG_HEAP");`
`1199`		`- if (tmp && zend_atoi(tmp, 0)) {`
	`1199`	`+ if (tmp && ZEND_ATOL(tmp, 0)) {`
`1200`	`1200`	`int tmp_flag;`
`1201`	`1201`	`_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);`
`1202`	`1202`	`_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);`