commit 66d072cad38f7278800edc28c8dc4b620b9c4b00
author scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 12 15:30:06 2013 +0000
committer scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 12 15:30:06 2013 +0000
tree 4c9b47b9fec6823996785a471f0f372a766d38ae
parent 81e7942a3b66e11b5436c9ef9a0062f4d014747f

Clean up after longjmp in SkImageDecoder_libpng.

In onDecodeInit, if longjmp sends us back to setjmp, destroy the
png_struct and info_ptr before returning false. Since the
PNGAutoClean has not been created yet, we were previously
leaking resources.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/68453006

git-svn-id: http://skia.googlecode.com/svn/trunk/src@12244 2bbb7eff-a529-9590-31e7-b0007b416f81

images/SkImageDecoder_libpng.cpp

diff --git a/images/SkImageDecoder_libpng.cpp b/images/SkImageDecoder_libpng.cpp
index b51ffb9..02ba6af 100644
--- a/images/SkImageDecoder_libpng.cpp
+++ b/images/SkImageDecoder_libpng.cpp
@@ -255,6 +255,7 @@
     * set up your own error handlers in the png_create_read_struct() earlier.
     */
     if (setjmp(png_jmpbuf(png_ptr))) {
+        png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
         return false;
     }