summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-12-04 22:48:54 +0100
committerGitHub <noreply@github.com>2018-12-04 22:48:54 +0100
commitd8314b102ef93aa0a5bda1d3c4fe4de0b5a01be8 (patch)
tree7161b964501ec7aa7b55038d3e6b1ac5f0d445ad /lib
parentf6924091207cc7fb4d11804cd3897b01a9f5efa9 (diff)
parent99bcc1363ecf33736993d83ff24ae5374f0d0f9a (diff)
downloadnextcloud-server-d8314b102ef93aa0a5bda1d3c4fe4de0b5a01be8.tar.gz
nextcloud-server-d8314b102ef93aa0a5bda1d3c4fe4de0b5a01be8.zip
Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects
Validate all rich objects
Diffstat (limited to 'lib')
-rw-r--r--lib/private/RichObjectStrings/Validator.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/RichObjectStrings/Validator.php b/lib/private/RichObjectStrings/Validator.php
index 55a50fc2a48..29980885cf8 100644
--- a/lib/private/RichObjectStrings/Validator.php
+++ b/lib/private/RichObjectStrings/Validator.php
@@ -71,11 +71,17 @@ class Validator implements IValidator {
foreach ($matches[1] as $parameter) {
if (!isset($parameters[$parameter])) {
throw new InvalidObjectExeption('Parameter is undefined');
- } else {
- $this->validateParameter($parameters[$parameter]);
}
}
}
+
+ foreach ($parameters as $parameter) {
+ if (!\is_array($parameter)) {
+ throw new InvalidObjectExeption('Parameter is malformed');
+ }
+
+ $this->validateParameter($parameter);
+ }
}
/**