[mms] Fix possible infinite loop when reading from a combined stream.

horde · Jan 28, 2015 · 6bbddc3 · 6bbddc3
1 parent ea73894
commit 6bbddc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php b/framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php
@@ -164,9 +164,13 @@ public function stream_read($count)
         }
 
         $out = '';
+        $tmp = &$this->_data[$this->_datapos];
 
         while ($count) {
-            $tmp = &$this->_data[$this->_datapos];
+            if (!is_resource($tmp['fp'])) {
+                return false;
+            }
+
             $curr_read = min($count, $tmp['l'] - $tmp['p']);
             $out .= fread($tmp['fp'], $curr_read);
             $count -= $curr_read;

diff --git a/framework/Stream_Wrapper/package.xml b/framework/Stream_Wrapper/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [mms] Fix possible infinite loop when reading from a combined stream.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -273,7 +273,7 @@
    <date>2015-01-09</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [mms] Fix possible infinite loop when reading from a combined stream.
    </notes>
   </release>
  </changelog>