Merge pull request #5936 from god107/zf4267

Fix for issue #4267
zendframework · Mar 10, 2014 · 69e1333 · 69e1333
2 parents fbf3eef + dc7afd4
commit 69e1333
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/library/Zend/Feed/Reader/Reader.php b/library/Zend/Feed/Reader/Reader.php
@@ -299,6 +299,11 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client)
      */
     public static function importString($string)
     {
+        $trimmed = trim($string);
+        if (!is_string($string) || empty($trimmed)) {
+            throw new Exception\InvalidArgumentException('Only non empty strings are allowed as input');
+        }
+
         $libxmlErrflag = libxml_use_internal_errors(true);
         $oldValue = libxml_disable_entity_loader(true);
         $dom = new DOMDocument;

diff --git a/tests/ZendTest/Feed/Reader/ReaderTest.php b/tests/ZendTest/Feed/Reader/ReaderTest.php
@@ -302,6 +302,13 @@ public function testImportRemoteFeedMethodPerformsAsExpected()
         $this->assertEquals(Reader\Reader::TYPE_RSS_20, $type);
     }
 
+    public function testImportStringMethodThrowProperExceptionOnEmptyString()
+    {
+        $this->setExpectedException('Zend\Feed\Reader\Exception\InvalidArgumentException');
+        $string = ' ';
+        $feed = Reader\Reader::importString($string);
+    }
+
     protected function _getTempDirectory()
     {
         $tmpdir = array();