diff options
| author | Aleksander Machniak <alec@alec.pl> | 2017-03-09 13:41:46 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2017-03-09 13:41:46 +0300 |
| commit | 8953c7a2577d0ad342fce1a3b6da1df08853ea60 (patch) | |
| tree | 5aaa7db305d6f844604ae4a3bc7b23cadcf7a470 /plugins/managesieve | |
| parent | 69fb773facddd919f10250814e589d8bc5581e33 (diff) | |
Fix possible defect in handling \r\n in scripts (#5685)
Diffstat (limited to 'plugins/managesieve')
| -rw-r--r-- | plugins/managesieve/Changelog | 1 | ||||
| -rw-r--r-- | plugins/managesieve/lib/Roundcube/rcube_sieve_script.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index 329738a81..397503cfc 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,4 +1,5 @@ - Fix handling of scripts with nested rules (#5540) +- Fix possible defect in handling \r\n in scripts (#5685) * version 8.8 [2016-11-27] ----------------------------------------------------------- diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php index 9d1c71445..8dbab5f75 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php @@ -1261,7 +1261,7 @@ class rcube_sieve_script if ($str[$position] == "\n") { $position++; } - else if ($str[$position] == "\r" && $str[$position] == "\n") { + else if ($str[$position] == "\r" && $str[$position + 1] == "\n") { $position += 2; } |