From: Eric Wong <e@80x24.org>
Date: Fri, 11 Feb 2022 20:22:17 +0000 (+0000)
Subject: view: remove all CR before LF
X-Git-Tag: v1.8.0~30
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=7ee3643af9b72cad2abf9cde4a48e389550ad71b

view: remove all CR before LF

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/
---

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 `&#8226;' in HTML
 	obfuscate_addrs($ibx, $s, "\x{2022}") if $ibx->{obfuscate};