255710 - nsDocShell::GetDocShellEnumerator leaks docShellEnum in failure cases

Status: RESOLVED FIXED

(Core :: DOM: Navigation, defect)

Description

[timeless]

a do {} while (0) loop could be used, otherwise something will have to manage
that pointer...

Comment 1

[Chris Thomas (CTho) [formerly [e-mail] [e-mail]]]

Attachment: patch v1

Comment 2

[Darin Fisher]

Comment on attachment 156218 [details] [diff] [review]
patch v1

>Index: nsDocShell.cpp

>     nsDocShellEnumerator*   docShellEnum;
>     if (aDirection == ENUMERATE_FORWARDS)
>         docShellEnum = new nsDocShellForwardsEnumerator;
>     else
>         docShellEnum = new nsDocShellBackwardsEnumerator;
>     
>     if (!docShellEnum) return NS_ERROR_OUT_OF_MEMORY;
>     
>+    nsCOMPtr<nsISupports> docShellEnumPtr(docShellEnum);

you could also just change the declaration of docShellEnum to:

      nsRefPtr<nsDocShellEnumerator> docShellEnum;

nsRefPtr is just like nsCOMPtr except that it can be used with
concrete class pointers.

Comment 3

[Chris Thomas (CTho) [formerly [e-mail] [e-mail]]]

Attachment: Patch v2

Comment 4

[Johnny Stenback (:jst)]

Comment on attachment 156307 [details] [diff] [review]
Patch v2

sr=jst

Comment 5

[Chris Thomas (CTho) [formerly [e-mail] [e-mail]]]

Timeless checked in the patch.