1392529 - Port |Bug 1385172 - Replace nsEscapeHTML{,2}() with new nsAppendEscapedHTML() function| to mailnews

Status: RESOLVED FIXED

(MailNews Core :: Backend, enhancement)

Description

[Jorg K (CEST = GMT+2)]

We have
mailnews/base/util/nsMsgUtils.h
#define MsgEscapeHTML(str) nsEscapeHTML(str)
#define MsgEscapeHTML2(buffer, len) nsEscapeHTML2(buffer, len)
and use MsgEscapeHTML quite a bit.

Comment 1

[Jorg K (CEST = GMT+2)]

Attachment: 1392529-nsEscapeHTML.patch

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/80e43346d487
Port bug 1385172 to mailnews: Replace nsEscapeHTML{,2}() with new nsAppendEscapedHTML() function. rs=bustage-fix

Comment 3

[Jorg K (CEST = GMT+2)]

Comment on attachment 8899762 [details] [diff] [review]
1392529-nsEscapeHTML.patch

Review of attachment 8899762 [details] [diff] [review]:
-----------------------------------------------------------------

::: mailnews/mime/src/mimeebod.cpp
@@ -396,4 @@
>            goto FAIL;
>          }
>          PL_strcpy(body, pre);
> -        PL_strcat(body, s2);

Note that s2 leaked :-(

Comment 4

[Jorg K (CEST = GMT+2)]

Attachment: 1392529-follow-up.patch

Follow-up as suggested by Eric Rahm in bug 1385172 comment #15.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/6136a4dd0f4d
Follow-up: use ToNewCString() instead of strdup(). r=me DONTBUILD

Comment 6

[:aceman]

Comment on attachment 8899762 [details] [diff] [review]
1392529-nsEscapeHTML.patch

Review of attachment 8899762 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks.

::: mailnews/mime/emitters/nsMimeBaseEmitter.cpp
@@ +878,1 @@
>        mHTMLHeaders.Append(escapedName);

Would it work to directly append to mHTMLHeaders?
nsAppendEscapedHTML(name, mHTMLHeaders);

Comment 7

[Jorg K (CEST = GMT+2)]

(In reply to :aceman from comment #6)
> Would it work to directly append to mHTMLHeaders?
> nsAppendEscapedHTML(name, mHTMLHeaders);
Yep. I'll do another follow-up.

Comment 8

[Jorg K (CEST = GMT+2)]

Attachment: 1392529-follow-up.patch (another one)

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/be1c2f371496
Follow-up (take 2): Simplification. r=aceman DONTBUILD