Fix leak in SkAutoSTArray

include/core/SkTemplates.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTemplates_DEFINED
@@ skipping 239 matching lines @@
 
     /** Destroys previous objects in the array and default constructs count number of objects */
     void reset(size_t count) {
         T* start = fArray;
         T* iter = start + fCount;
         while (iter > start) {
             (--iter)->~T();
         }
 
         if (fCount != count) {
-            if (count > N) {
+            if (fCount > N) {
+                // 'fArray' was allocated last time so free it now
                 sk_free(fArray);
             }
 
             if (count > N) {
                 fArray = (T*) sk_malloc_throw(count * sizeof(T));
             } else if (count > 0) {
                 fArray = (T*) fStorage;
             } else {
                 fArray = NULL;
                 return;

[reed1, 2013/07/12 14:48:45]

Eeek! If we get here, seems like we will not have set fCount to 0... Why do we
need the return statement?

             }
 
             fCount = count;
         }
 
         iter = fArray;
         T* stop = fArray + count;
         while (iter < stop) {
             SkNEW_PLACEMENT(iter++, T);
         }
@@ skipping 173 matching lines @@
     /**
      * Returns void* because this object does not initialize the
      * memory. Use placement new for types that require a cons.
      */
     void* get() { return fStorage.get(); }
 private:
     SkAlignedSStorage<sizeof(T)*N> fStorage;
 };
 
 #endif