Checked result value of glob()

webmozarts · Dec 23, 2015 · ee2e309 · ee2e309
1 parent 1b60f67
commit ee2e309
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* 3.3.1 (@release_date@)
+
+ * checked return value of `glob()`
+
 * 3.3.0 (2015-12-23)
 
  * improved globbing performance by falling back to PHP's `glob()` function

diff --git a/src/Iterator/GlobIterator.php b/src/Iterator/GlobIterator.php
@@ -59,7 +59,11 @@ public function __construct($glob, $flags = 0)
                     $glob = str_replace('\\', '\\\\', $glob);
                 }
 
-                $innerIterator = new ArrayIterator(glob($glob, GLOB_BRACE));
+                if (false === $results = glob($glob, GLOB_BRACE)) {
+                    $innerIterator = new EmptyIterator();
+                } else {
+                    $innerIterator = new ArrayIterator($results);
+                }
             } else {
                 // Otherwise scan the glob's base directory for matches
                 $innerIterator = new GlobFilterIterator(