[Pkg-owncloud-commits] [php-sabre-vobject] 29/38: check a̲l̲l̲ control chars from RFC5545 §3.3.11. (below \x80, anyway)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch upstream
in repository php-sabre-vobject.

commit d45850b10f43db874ff6941a6129bcda95984bf3
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Fri Sep 19 12:42:31 2014 +0200

    check a̲l̲l̲ control chars from RFC5545 §3.3.11. (below \x80, anyway)
    
    fixes https://github.com/fruux/sabre-vobject/issues/134
---
 lib/Property.php               |  2 +-
 lib/StringUtil.php             |  2 +-
 tests/VObject/PropertyTest.php | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/Property.php b/lib/Property.php
index ea606d3..079837f 100644
--- a/lib/Property.php
+++ b/lib/Property.php
@@ -474,7 +474,7 @@ abstract class Property extends Node {
             }
 
 
-            if (preg_match('%([\x00-\x08\x0B-\x0C\x0E\x0F])%', $oldValue, $matches)) {
+            if (preg_match('%([\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', $oldValue, $matches)) {
                 $message = 'Property contained a control character (0x' . bin2hex($matches[1]) . ')';
             } else {
                 $message = 'Property is not valid UTF-8! ' . $oldValue;
diff --git a/lib/StringUtil.php b/lib/StringUtil.php
index 456cd43..98bd7c1 100644
--- a/lib/StringUtil.php
+++ b/lib/StringUtil.php
@@ -62,7 +62,7 @@ class StringUtil {
         }
 
         // Removing any control characters
-        return (preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E\x0F])%', '', $newStr));
+        return (preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $newStr));
 
     }
 
diff --git a/tests/VObject/PropertyTest.php b/tests/VObject/PropertyTest.php
index fe520ff..ec68edc 100644
--- a/tests/VObject/PropertyTest.php
+++ b/tests/VObject/PropertyTest.php
@@ -268,6 +268,29 @@ class PropertyTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    function testValidateControlChars() {
+
+        $s = "chars[";
+        foreach (array(
+            0x7F, 0x5E, 0x5C, 0x3B, 0x3A, 0x2C, 0x22, 0x20,
+            0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18,
+            0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
+            0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
+            0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
+          ) as $c) {
+            $s .= sprintf('%02X(%c)', $c, $c);
+        }
+        $s .= "]end";
+
+        $calendar = new VCalendar();
+        $property = $calendar->createProperty('X-PROP', $s);
+        $result = $property->validate(Property::REPAIR);
+
+        $this->assertEquals('Property contained a control character (0x7f)', $result[0]['message']);
+        $this->assertEquals("chars[7F()5E(^)5C(\\\\)3B(\\;)3A(:)2C(\\,)22(\")20( )1F()1E()1D()1C()1B()1A()19()18()17()16()15()14()13()12()11()10()0F()0E()0D()0C()0B()0A(\\n)09(	)08()07()06()05()04()03()02()01()00()]end", $property->getRawMimeDirValue());
+
+    }
+
 
     function testValidateBadPropertyName() {
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git