Initial error handling code

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 "SkBitmap.h"
@@ skipping 248 matching lines @@
                 SkIntToScalar(fWidth), SkIntToScalar(fHeight));
 }
 
 void SkBitmap::getBounds(SkIRect* bounds) const {
     SkASSERT(bounds);
     bounds->set(0, 0, fWidth, fHeight);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+bool SkBitmap::IsValidConfig(Config config) {

[reed1, 2013/09/03 20:25:21]

I'm not 100% sure that the compile will always execute this. Is there ever a
chance that an optimizing one will decide that the list is complete, and turn
the entire function into

return true;

[sugoi1, 2013/09/04 18:01:10]

Not sure, but I've changed it just to be certain.

+    switch (config) {
+    case kNo_Config:
+    case kA1_Config:
+    case kA8_Config:
+    case kIndex8_Config:
+    case kRGB_565_Config:
+    case kARGB_4444_Config:
+    case kARGB_8888_Config:
+        return true;
+    default:
+        break;
+    }
+    return false;
+}
+
 void SkBitmap::setConfig(Config c, int width, int height, size_t rowBytes) {
     this->freePixels();
 
     if ((width | height) < 0) {
         goto err;
     }
 
     if (rowBytes == 0) {
         rowBytes = SkBitmap::ComputeRowBytes(c, width);
         if (0 == rowBytes && kNo_Config != c) {
@@ skipping 1321 matching lines @@
         buffer.writeInt(SERIALIZE_PIXELTYPE_NONE);
     }
 }
 
 void SkBitmap::unflatten(SkFlattenableReadBuffer& buffer) {
     this->reset();
 
     int width = buffer.readInt();
     int height = buffer.readInt();
     int rowBytes = buffer.readInt();
-    int config = buffer.readInt();
+    Config config = (Config)buffer.readInt();
+    buffer.validateData((width >= 0) && (height >= 0) && (rowBytes >= 0) &&
+                        IsValidConfig(config));
 
-    this->setConfig((Config)config, width, height, rowBytes);
+    this->setConfig(config, width, height, rowBytes);
     this->setIsOpaque(buffer.readBool());
 
     int reftype = buffer.readInt();
     switch (reftype) {
         case SERIALIZE_PIXELTYPE_REF_DATA: {
             size_t offset = buffer.readUInt();
             SkPixelRef* pr = buffer.readFlattenableT<SkPixelRef>();
             SkSafeUnref(this->setPixelRef(pr, offset));
             break;
         }
         case SERIALIZE_PIXELTYPE_NONE:
             break;
         default:
+            buffer.validateData(false);
             SkDEBUGFAIL("unrecognized pixeltype in serialized data");
             sk_throw();
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkBitmap::RLEPixels::RLEPixels(int width, int height) {
     fHeight = height;
     fYPtrs = (uint8_t**)sk_malloc_throw(height * sizeof(uint8_t*));
@@ skipping 64 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif