From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 6 Nov 2019 16:50:48 +0000 (+0100)
Subject: Move extra checks after zpp in get_browser()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b312598daf8da5d7bc3224fc9a371b3ee3b78276;p=php

Move extra checks after zpp in get_browser()
---

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index a98810bc43..8e99b925db 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -686,6 +686,12 @@ PHP_FUNCTION(get_browser)
 	browscap_entry *found_entry = NULL;
 	HashTable *agent_ht;
 
+	ZEND_PARSE_PARAMETERS_START(0, 2)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STR_EX(agent_name, 1, 0)
+		Z_PARAM_BOOL(return_array)
+	ZEND_PARSE_PARAMETERS_END();
+
 	if (BROWSCAP_G(activation_bdata).filename[0] != '\0') {
 		bdata = &BROWSCAP_G(activation_bdata);
 		if (bdata->htab == NULL) { /* not initialized yet */
@@ -701,12 +707,6 @@ PHP_FUNCTION(get_browser)
 		bdata = &global_bdata;
 	}
 
-	ZEND_PARSE_PARAMETERS_START(0, 2)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_STR_EX(agent_name, 1, 0)
-		Z_PARAM_BOOL(return_array)
-	ZEND_PARSE_PARAMETERS_END();
-
 	if (agent_name == NULL) {
 		zval *http_user_agent = NULL;
 		if (Z_TYPE(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY