Merge branch 'release/3.2'

src/pocketmine/network/mcpe/handler/SimpleSessionHandler.php

@@ -391,7 +391,37 @@ class SimpleSessionHandler extends SessionHandler{
 	}
 
 	public function handleModalFormResponse(ModalFormResponsePacket $packet) : bool{
-		return $this->player->onFormSubmit($packet->formId, json_decode($packet->formData, true));
+		return $this->player->onFormSubmit($packet->formId, self::stupid_json_decode($packet->formData, true));
+	}
+
+	/**
+	 * Hack to work around a stupid bug in Minecraft W10 which causes empty strings to be sent unquoted in form responses.
+	 *
+	 * @param string $json
+	 * @param bool   $assoc
+	 *
+	 * @return mixed
+	 */
+	private static function stupid_json_decode(string $json, bool $assoc = false){
+		if(preg_match('/^\[(.+)\]$/s', $json, $matches) > 0){
+			$parts = preg_split('/(?:"(?:\\"|[^"])*"|)\K(,)/', $matches[1]); //Splits on commas not inside quotes, ignoring escaped quotes
+			foreach($parts as $k => $part){
+				$part = trim($part);
+				if($part === ""){
+					$part = "\"\"";
+				}
+				$parts[$k] = $part;
+			}
+
+			$fixed = "[" . implode(",", $parts) . "]";
+			if(($ret = json_decode($fixed, $assoc)) === null){
+				throw new \InvalidArgumentException("Failed to fix JSON: " . json_last_error_msg() . "(original: $json, modified: $fixed)");
+			}
+
+			return $ret;
+		}
+
+		return json_decode($json, $assoc);
 	}
 
 	public function handleServerSettingsRequest(ServerSettingsRequestPacket $packet) : bool{

tests/phpunit/network/mcpe/handler/StupidJsonDecodeTest.php

@@ -0,0 +1,56 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\network\mcpe\handler;
+
+use PHPUnit\Framework\TestCase;
+
+class StupidJsonDecodeTest extends TestCase{
+
+	public function stupidJsonDecodeProvider() : array{
+		return [
+			["[\n   \"a\",\"b,c,d,e\\\"   \",,0,1,2, false, 0.001]", ['a', 'b,c,d,e"   ', '', 0, 1, 2, false, 0.001]],
+			["0", 0],
+			["false", false],
+			["NULL", null],
+			['["\",,\"word","a\",,\"word2",]', ['",,"word', 'a",,"word2', '']],
+			['["\",,\"word","a\",,\"word2",""]', ['",,"word', 'a",,"word2', '']]
+		];
+	}
+
+	/**
+	 * @dataProvider stupidJsonDecodeProvider
+	 *
+	 * @param string $brokenJson
+	 * @param mixed  $expect
+	 *
+	 * @throws \ReflectionException
+	 */
+	public function testStupidJsonDecode(string $brokenJson, $expect){
+		$func = new \ReflectionMethod(SimpleSessionHandler::class, 'stupid_json_decode');
+		$func->setAccessible(true);
+
+		$decoded = $func->invoke(null, $brokenJson, true);
+		self::assertEquals($expect, $decoded);
+	}
+}