diff options
| author | Eric Wong <e@80x24.org> | 2022-02-11 20:22:17 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2022-02-11 20:30:45 +0000 |
| commit | 7ee3643af9b72cad2abf9cde4a48e389550ad71b (patch) | |
| tree | 24cd5585c7391ddf618cab5537ebf40b5d0cf3b8 | |
| parent | 303c3507b4aefc0e08d792de02357ea9ab0fc322 (diff) | |
| download | public-inbox-7ee3643af9b72cad2abf9cde4a48e389550ad71b.tar.gz | |
While we've rendered CR-LF as LF-only in HTML for many years, some messages end up as CR-CR-LF. So strip ALL all CR bytes preceding LF bytes, while preserving odd CR in the middle of lines. Reported-by: Thomas Weißschuh <thomas@t-8ch.de> Link: https://public-inbox.org/meta/8d13668f-cac7-4984-bb4e-ad90502dc46d@t-8ch.de/
| -rw-r--r-- | lib/PublicInbox/View.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 2e9cf705..ca02ae05 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -586,7 +586,7 @@ sub add_text_body { # callback for each_part # makes no difference to browsers, and don't screw up filename # link generation in diffs with the extra '%0D' - $s =~ s/\r\n/\n/sg; + $s =~ s/\r+\n/\n/sg; # will be escaped to `•' in HTML obfuscate_addrs($ibx, $s, "\x{2022}") if $ibx->{obfuscate}; |