684452 - Memory leak in nsEmlxHelperUtils::AddEmlxMessageToStream

Status: RESOLVED FIXED

Description

[Hiroyuki Ikezoe (:hiro)]

The return value of PR_smprintf should be freed by PR_smprintf_free.

Comment 1

[Hiroyuki Ikezoe (:hiro)]

Created attachment 558043 [details] [diff] [review]
Proposed fix

I have no build environment for Mac OS X, so I don't build comm-central on Mac OS X with this patch.

Comment 2

[Mark Banner (:standard8) (afk 11 - 20 Aug)]

Comment on attachment 558043 [details] [diff] [review]
Proposed fix

Fly-by comment: Doing this might be slightly nicer:

nsCAutoString buf;
buf.Adopt(PR_smprintf(X_MOZILLA_STATUS_FORMAT MSG_LINEBREAK, x_mozilla_flags));

Then you don't have to worry about what size the memory is.

Comment 3

[Hiroyuki Ikezoe (:hiro)]

Created attachment 558248 [details] [diff] [review]
Revised patch

Follow Mark's comment.

> nsCAutoString buf;
> buf.Adopt(PR_smprintf(X_MOZILLA_STATUS_FORMAT MSG_LINEBREAK,
> x_mozilla_flags));
> 
> Then you don't have to worry about what size the memory is.

I did not know the Adopt method. Thanks for the advice!

Comment 4

[Hiroyuki Ikezoe (:hiro)]

Created attachment 558249 [details] [diff] [review]
Rewrite with Adopt for X-Mozilla-Status2 header

Also use Adopt for X-Mozilla-Status2 header.

Comment 5

[Hiroyuki Ikezoe (:hiro)]

Comment on attachment 558248 [details] [diff] [review]
Revised patch

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

::: mailnews/import/applemail/src/nsEmlxHelperUtils.mm
@@ +206,5 @@
>    NS_ASSERTION(!buf.IsEmpty(), "printf error with X-Mozilla-Status header");
>    if (buf.IsEmpty()) {
>      [pool release];
>      return rv;
>    }

The return value of this failure case seems to be NS_OK. Should return error value? Should I open a new bug for it?

Comment 6

[Wayne Mery (:wsmwk, NI for questions)]

bienvenu?

(In reply to Hiroyuki Ikezoe (:hiro) from comment #5)
> Comment on attachment 558248 [details] [diff] [review]
> Revised patch
> 
> Review of attachment 558248 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: mailnews/import/applemail/src/nsEmlxHelperUtils.mm
> @@ +206,5 @@
> >    NS_ASSERTION(!buf.IsEmpty(), "printf error with X-Mozilla-Status header");
> >    if (buf.IsEmpty()) {
> >      [pool release];
> >      return rv;
> >    }
> 
> The return value of this failure case seems to be NS_OK. Should return error
> value? Should I open a new bug for it?

Comment 7

[David :Bienvenu]

Comment on attachment 558249 [details] [diff] [review]
Rewrite with Adopt for X-Mozilla-Status2 header

sorry for the delay - I think in out of memory, you want to return NS_ERROR_OUT_OF_MEMORY, not rv. Other than that, it looks OK (except for the question of whether the allocator aborts the app in the case of out of memory, in which case this code wouldn't be hit).

Comment 8

[David :Bienvenu]

Comment on attachment 558248 [details] [diff] [review]
Revised patch

thx for the patch

Comment 9

[Hiroyuki Ikezoe (:hiro)]

Created attachment 591689 [details] [diff] [review]
Return NS_ERROR_OUT_OF_MEMORY instead of rv.

Comment 10

[David :Bienvenu]

Comment on attachment 591689 [details] [diff] [review]
Return NS_ERROR_OUT_OF_MEMORY instead of rv.

thx for the patch...

Comment 11

[Mark Banner (:standard8) (afk 11 - 20 Aug)]

Comment on attachment 558248 [details] [diff] [review]
Revised patch

I understand this patch isn't required, so marking obsolete.

Comment 12

[Mark Banner (:standard8) (afk 11 - 20 Aug)]

Checked in: http://hg.mozilla.org/comm-central/rev/1717874b0963