Move checks after zpp in opcache_is_script_cached()

nikic · nikic · commit eb04cb5f2016 · 2020-07-22T10:52:50.000+02:00
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -909,6 +909,10 @@ ZEND_FUNCTION(opcache_is_script_cached)
 {
 	zend_string *script_name;
 
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &script_name) == FAILURE) {
+		RETURN_THROWS();
+	}
+
 	if (!validate_api_restriction()) {
 		RETURN_FALSE;
 	}
@@ -917,9 +921,5 @@ ZEND_FUNCTION(opcache_is_script_cached)
 		RETURN_FALSE;
 	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &script_name) == FAILURE) {
-		RETURN_THROWS();
-	}
-
 	RETURN_BOOL(filename_is_in_cache(script_name));
 }

Original file line number	Diff line number	Diff line change
`@@ -909,6 +909,10 @@ ZEND_FUNCTION(opcache_is_script_cached)`
`909`	`909`	`{`
`910`	`910`	`zend_string *script_name;`
`911`	`911`
	`912`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &script_name) == FAILURE) {`
	`913`	`+ RETURN_THROWS();`
	`914`	`+ }`
	`915`	`+`
`912`	`916`	`if (!validate_api_restriction()) {`
`913`	`917`	`RETURN_FALSE;`
`914`	`918`	`}`
`@@ -917,9 +921,5 @@ ZEND_FUNCTION(opcache_is_script_cached)`
`917`	`921`	`RETURN_FALSE;`
`918`	`922`	`}`
`919`	`923`
`920`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &script_name) == FAILURE) {`
`921`		`- RETURN_THROWS();`
`922`		`- }`
`923`		`-`
`924`	`924`	`RETURN_BOOL(filename_is_in_cache(script_name));`
`925`	`925`	`}`