change colortable to use factory for reinflating, check for empty

src/core/SkBitmap.cpp

 /*
  * Copyright 2008 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.
  */
 
 #include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 1127 matching lines @@
         for (int y = height - 1; y >= 1; --y) {
             memmove(dstRow, srcRow, snugRB);
             srcRow -= snugRB;
             dstRow -= ramRB;
         }
         SkASSERT(srcRow == dstRow); // first row does not need to be moved
     }
 
     SkAutoTUnref<SkColorTable> ctable;
     if (buffer->readBool()) {
-        ctable.reset(new SkColorTable(*buffer));
+        ctable.reset(SkColorTable::Create(*buffer));
+        if (!ctable) {
+            return false;
+        }
+        // only permit an empty table if we have no pixels

[robertphillips, 2015/08/28 15:58:53]

seems some guard is missing here

[reed1, 2015/08/28 16:01:08]

Done.

+        if (ctable->count() == 0 && info.width() > 0 && info.height() > 0) {
+            return false;
+        }
 
-        unsigned char maxIndex = ctable->count() ? ctable->count()-1 : 0;
+        unsigned char maxIndex = ctable->count() - 1;
         for (uint64_t i = 0; i < ramSize; ++i) {
             dst[i] = SkTMin(dst[i], maxIndex);
         }
     }
 
     SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(),
                                                               ctable.get(), data.get()));
     if (!pr.get()) {
         return false;
     }
@@ skipping 139 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif