439266 - Leak of array if rv != NS_OK in BuildSearchElements()

Status: RESOLVED FIXED

(MailNews Core :: Address Book, defect)

Description

[Håkan Waara]

BuildSearchElements() in nsAbOSXDirectory.mm will leak an NSArray and all its items if it's returning early with NS_ENSURE_SUCCESS(rv, rv).

Fix coming up.

Comment 1

[Håkan Waara]

Attachment: Fix v1

Fix to make sure we always escape from the loop (instead of returning early) on error.

Comment 2

[Mark Banner (:standard8)]

Comment on attachment 325130 [details] [diff] [review]
Fix v1

     if (!aCanHandle) {
-      return NS_OK;
+      rv = NS_OK;
+      break;
     }

The way I read this, we'll be processing the if (array) statement below in the !aCanHandle case, whereas we wouldn't have before.

I don't think that matters, but could you see if you agree, and if so, please could you add some comments onto BuildSearchElements stating that if aCanHandle is false, the result should be ignored?

Comment 3

[Håkan Waara]

Attachment: Fix v2

Comment 4

[Håkan Waara]

Checked in.