From b2c2d18b28dc0d4dfadf15e8ad91693bb7b2ad1f Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 20 Jul 2016 12:06:19 +0800 Subject: [PATCH] MDL-55283 javascript: Check dir is readable before traversing them --- lib/classes/requirejs.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/classes/requirejs.php b/lib/classes/requirejs.php index ebe4e6ff19b..6c75cc2d542 100644 --- a/lib/classes/requirejs.php +++ b/lib/classes/requirejs.php @@ -108,6 +108,11 @@ class core_requirejs { if ($debug) { $srcdir = $dir . '/src'; } + if (!is_dir($srcdir) || !is_readable($srcdir)) { + // This is probably an empty amd directory without src or build. + // Skip it - RecursiveDirectoryIterator fatals if the directory is not readable as an iterator. + continue; + } $items = new RecursiveDirectoryIterator($srcdir); foreach ($items as $item) { $extension = $item->getExtension();