From 21106b3d1c1dc9dea14f2abc8e6a2d4073b91f65 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 05 Jan 2013 14:16:06 -0500
Subject: [PATCH] Fix handling of escaped separator in vCard file (#1488896)
---
CHANGELOG | 1 +
program/lib/Roundcube/rcube_vcard.php | 18 ++++++++++++------
tests/Framework/VCard.php | 10 ++++++----
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 525aac4..234c10c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix handling of escaped separator in vCard file (#1488896)
- Fix #countcontrols issue in IE<=8 when text is very long (#1488890)
- Add option to use envelope From address for MDN responses (#1488880)
- Add possibility to search in message body only (#1488770)
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index e6fa5b2..c2b30af 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -770,15 +770,21 @@
*/
private static function vcard_unquote($s, $sep = ';')
{
- // break string into parts separated by $sep, but leave escaped $sep alone
- if (count($parts = explode($sep, strtr($s, array("\\$sep" => "\007")))) > 1) {
- foreach($parts as $s) {
- $result[] = self::vcard_unquote(strtr($s, array("\007" => "\\$sep")), $sep);
+ // break string into parts separated by $sep
+ if (!empty($sep)) {
+ // Handle properly backslash escaping (#1488896)
+ $rep1 = array("\\\\" => "\010", "\\$sep" => "\007");
+ $rep2 = array("\007" => "\\$sep", "\010" => "\\\\");
+
+ if (count($parts = explode($sep, strtr($s, $rep1))) > 1) {
+ foreach ($parts as $s) {
+ $result[] = self::vcard_unquote(strtr($s, $rep2));
+ }
+ return $result;
}
- return $result;
}
- return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';', '\:' => ':'));
+ return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
}
/**
diff --git a/tests/Framework/VCard.php b/tests/Framework/VCard.php
index 3bc01b1..15aa5d8 100644
--- a/tests/Framework/VCard.php
+++ b/tests/Framework/VCard.php
@@ -55,12 +55,14 @@
*/
function test_parse_four()
{
- $vcard = "BEGIN:VCARD\nVERSION:3.0\nN:last\\;;first\\\\;middle;;\nFN:test\nEND:VCARD";
+ $vcard = "BEGIN:VCARD\nVERSION:3.0\nN:last\\;;first\\\\;middle\\\\\\;\\\\;prefix;\nFN:test\nEND:VCARD";
$vcard = new rcube_vcard($vcard, null);
+ $vcard = $vcard->get_assoc();
- $this->assertEquals("last;", $vcard->surname, "Decode backslash character");
- $this->assertEquals("first\\", $vcard->firstname, "Decode backslash character");
- $this->assertEquals("middle", $vcard->middlename, "Decode backslash character");
+ $this->assertEquals("last;", $vcard['surname'], "Decode backslash character");
+ $this->assertEquals("first\\", $vcard['firstname'], "Decode backslash character");
+ $this->assertEquals("middle\\;\\", $vcard['middlename'], "Decode backslash character");
+ $this->assertEquals("prefix", $vcard['prefix'], "Decode backslash character");
}
function test_import()
--
Gitblit v1.9.1