413424 - PNG encoder leaks a string

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Justin Dolske [:Dolske]]

Attachment: Patch v.1

Caught this while looking at Solaris leaks with libumem. Doh, my bad, I wrote this code. :)

Comment 1

[Mike Schroepfer]

Comment on attachment 298382 [details] [diff] [review]
Patch v.1

a1.9 Not sure whether to be angry you leaked or happy you fixed it :-).

Comment 2

[Justin Dolske [:Dolske]]

Let's go with "happy". :-)

Checking in modules/libpr0n/encoders/png/nsPNGEncoder.cpp;
/cvsroot/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp,v  <--  nsPNGEncoder.cpp
new revision: 1.7; previous revision: 1.6
done

Comment 3

[jag (Peter Annema)]

Comment on attachment 298382 [details] [diff] [review]
Patch v.1

>-  char* options = nsCRT::strdup(PromiseFlatCString(NS_ConvertUTF16toUTF8(aOptions)).get());

For future reference, NS_ConvertXXXtoYYY is always flat, it has a .get() method, so no need for the PromiseFlat(C)String.

>+  // Make a copy of aOptions, because strtok() will modify it.
>+  nsCAutoString optionsCopy;
>+  optionsCopy.Assign(NS_ConvertUTF16toUTF8(aOptions));

Here you can avoid one buffer copy if you use CopyUTF16toUTF8(aOptions, optionsCopy);