[mms] Relax overly strict string type checking when compressing/decom…

…pressing.
horde · Jul 8, 2014 · edb2959 · edb2959
1 parent 6879022
commit edb2959
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/framework/Compress_Fast/lib/Horde/Compress/Fast.php b/framework/Compress_Fast/lib/Horde/Compress/Fast.php
@@ -86,11 +86,11 @@ public function __get($name)
      */
     public function compress($text)
     {
-        if (!is_string($text)) {
+        if (!is_scalar($text) && !is_null($text)) {
             throw new Horde_Compress_Fast_Exception('Data to compress must be a string.');
         }
 
-        return $this->_compress->compress($text);
+        return $this->_compress->compress(strval($text));
     }
 
     /**
@@ -103,11 +103,11 @@ public function compress($text)
      */
     public function decompress($text)
     {
-        if (!is_string($text)) {
+        if (!is_scalar($text) && !is_null($text)) {
             throw new Horde_Compress_Fast_Exception('Data to decompress must be a string.');
         }
 
-        return $this->_compress->decompress($text);
+        return $this->_compress->decompress(strval($text));
     }
 
 }
diff --git a/framework/Compress_Fast/package.xml b/framework/Compress_Fast/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Relax overly strict string type checking when compressing/decompressing.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -168,7 +168,7 @@
    <date>2013-07-16</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Relax overly strict string type checking when compressing/decompressing.
    </notes>
   </release>
  </changelog>

diff --git a/framework/Compress_Fast/test/Horde/Compress/Fast/CompressFastTest.php b/framework/Compress_Fast/test/Horde/Compress/Fast/CompressFastTest.php
@@ -177,4 +177,42 @@ public function testLz4DriverDecompress()
         } catch (Horde_Compress_Fast_Exception $e) {}
     }
 
+    /**
+     * @dataProvider providerTestStringInput
+     */
+    public function testStringInput($data, $success)
+    {
+        $ob = new Horde_Compress_Fast(array(
+            'drivers' => array(
+                'Horde_Compress_Fast_Null'
+            )
+        ));
+
+        try {
+            $ob->compress($data);
+            if (!$success) {
+                $this->fail('Expected exception.');
+            }
+        } catch (Horde_Compress_Fast_Exception $e) {
+            if ($success) {
+                $this->fail('Unexpected exception.');
+            }
+        }
+    }
+
+    public function providerTestStringInput()
+    {
+        // Format: data, expected success
+        return array(
+            array('a', true),
+            array(0.1, true),
+            array(1, true),
+            array(true, true),
+            array(null, true),
+            array(array(), false),
+            array(new stdClass, false),
+            array(opendir(__DIR__), false)
+        );
+    }
+
 }