- Added mail_header_delimiter validation

git-svn-id: https://svn.roundcube.net/trunk@3937 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 11 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index eb2e088c4..488ffc420 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/program/include/rcube_config.php
@@ -247,8 +247,17 @@ class rcube_config
     public function header_delimiter()
     {
         // use the configured delimiter for headers
-        if (!empty($this->prop['mail_header_delimiter']))
-            return $this->prop['mail_header_delimiter'];
+        if (!empty($this->prop['mail_header_delimiter'])) {
+            $delim = $this->prop['mail_header_delimiter'];
+            if ($delim == "\n" || $delim == "\r\n")
+                return $delim;
+            else
+                raise_error(array(
+                    'code' => 500, 'type' => 'php',
+	                'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Invalid mail_header_delimiter setting"
+                ), true, false);
+        }
 
         $php_os = strtolower(substr(PHP_OS, 0, 3));