commit 3a100d3e4de7a640d558352c544724801ab842f3
author reed <reed@google.com> Mon Sep 14 09:59:28 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Sep 14 09:59:28 2015 -0700
tree 8b6a50d9451b1561ee36eba7ef15b2b206dc5954
parent 56f38fb7a9ccd1c0e04ea4896ef7724836836671

we must own/free the generator, even if we fail to return a cacherator

BUG=skia:4332

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

src/core/SkImageCacherator.cpp

diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp
index bdcd64f..b138853 100644
--- a/src/core/SkImageCacherator.cpp
+++ b/src/core/SkImageCacherator.cpp
@@ -27,6 +27,10 @@
     if (!gen) {
         return nullptr;
     }
+
+    // We are required to take ownership of gen, regardless of if we return a cacherator or not
+    SkAutoTDelete<SkImageGenerator> genHolder(gen);
+
     const SkImageInfo& info = gen->getInfo();
     if (info.isEmpty()) {
         return nullptr;
@@ -46,6 +50,10 @@
         subset = &bounds;
     }
 
+    // Now that we know we can hand-off the generator (to be owned by the cacherator) we can
+    // release our holder. (we DONT want to delete it here anymore)
+    genHolder.detach();
+
     return new SkImageCacherator(gen, gen->getInfo().makeWH(subset->width(), subset->height()),
                                  SkIPoint::Make(subset->x(), subset->y()), uniqueID);
 }