Merge pull request phpbb#6811 from rxu/ticket/17506

marc1706 · web-flow · commit b3478d83d1df · 2025-05-19T17:44:47.000+02:00
[ticket/17506] Ensure superglobal variables are arrays before applying addition - 3.3.x
diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php
@@ -70,12 +70,12 @@ public function __construct(\phpbb\request\type_cast_helper_interface $type_cast
 
 		foreach ($this->super_globals as $const => $super_global)
 		{
-			$this->input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();
+			$this->input[$const] = isset($GLOBALS[$super_global]) ? (array) $GLOBALS[$super_global] : array();
 		}
 
 		// simulate request_order = GP
-		$this->original_request = $this->input[\phpbb\request\request_interface::REQUEST];
-		$this->input[\phpbb\request\request_interface::REQUEST] = $this->input[\phpbb\request\request_interface::POST] + $this->input[\phpbb\request\request_interface::GET];
+		$this->original_request = (array) $this->input[\phpbb\request\request_interface::REQUEST];
+		$this->input[\phpbb\request\request_interface::REQUEST] = (array) $this->input[\phpbb\request\request_interface::POST] + (array) $this->input[\phpbb\request\request_interface::GET];
 
 		if ($disable_super_globals)
 		{

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ public function __construct(\phpbb\request\type_cast_helper_interface $type_cast`
`70`	`70`
`71`	`71`	`foreach ($this->super_globals as $const => $super_global)`
`72`	`72`	`{`
`73`		`- $this->input[$const] = isset($GLOBALS[$super_global]) ? $GLOBALS[$super_global] : array();`
	`73`	`+ $this->input[$const] = isset($GLOBALS[$super_global]) ? (array) $GLOBALS[$super_global] : array();`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// simulate request_order = GP`
`77`		`- $this->original_request = $this->input[\phpbb\request\request_interface::REQUEST];`
`78`		`- $this->input[\phpbb\request\request_interface::REQUEST] = $this->input[\phpbb\request\request_interface::POST] + $this->input[\phpbb\request\request_interface::GET];`
	`77`	`+ $this->original_request = (array) $this->input[\phpbb\request\request_interface::REQUEST];`
	`78`	`+ $this->input[\phpbb\request\request_interface::REQUEST] = (array) $this->input[\phpbb\request\request_interface::POST] + (array) $this->input[\phpbb\request\request_interface::GET];`
`79`	`79`
`80`	`80`	`if ($disable_super_globals)`
`81`	`81`	`{`