Also throw on invalid object data

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/lib/Service/RoomService.php b/lib/Service/RoomService.php
index 2960cbaed..cee119c8e 100644
--- a/lib/Service/RoomService.php
+++ b/lib/Service/RoomService.php
@@ -91,6 +91,21 @@ class RoomService {
 			throw new InvalidArgumentException('type');
 		}
 
+		$objectType = trim($objectType);
+		if (isset($objectType[64])) {
+			throw new InvalidArgumentException('object_type');
+		}
+
+		$objectId = trim($objectId);
+		if (isset($objectId[64])) {
+			throw new InvalidArgumentException('object_id');
+		}
+
+		if (($objectType !== '' && $objectId === '') ||
+			($objectType === '' && $objectId !== '')) {
+			throw new InvalidArgumentException('object');
+		}
+
 		$room = $this->manager->createRoom($type, $name, $objectType, $objectId);
 
 		if ($owner instanceof IUser) {