487018 - Allocator mismatches in libjar

Status: RESOLVED FIXED

(Core :: Networking: JAR, defect)

Description

[[e-mail]]

* In nsWildCard/nsZipFind, the pattern is created using PL_strdup but freed (in several places) using PR_Free
* In nsJARManifestItem the string created by CalculatedDigest using ToNewCString is freed in several places using PR_FREEIF

Comment 1

[[e-mail]]

Attachment: Basic patch

Comment 2

[[e-mail]]

Actually nsWildCard and nsZipFind are separate allocations.

Comment 3

[[e-mail]]

Attachment: Typo fix

Comment 4

[[e-mail]]

Attachment: Avoid manual memory management

Switching to nsCString reduces the amount of memory management necessary.

Comment 5

[Daniel Veditz [:dveditz]]

Comment on attachment 371219 [details] [diff] [review]
Avoid manual memory management

>+++ b/modules/libjar/nsZipArchive.cpp	Mon Apr 06 11:57:36 2009 +0100
>@@ -740,17 +740,18 @@ nsZipArchive::FindInit(const char * aPat
>   if (!*aFind) {
>-    PR_FREEIF(pattern);
>+    if (pattern)
>+      PL_strfree(pattern);

It should be safe to pass null to PL_strfree()

>-  PR_FREEIF(mPattern);
>+  if (mPattern)
>+    PL_strfree(mPattern);

ditto.

sr=dveditz

Comment 6

[Daniel Veditz [:dveditz]]

Comment on attachment 371217 [details] [diff] [review]
Typo fix

This appears to be obsoleted by attachment 371219 [details] [diff] [review].

Comment 7

[[e-mail]]

Pushed changeset 1fd2edfa2d49 to mozilla-central.