Checking structure sizes before reading them from memory to avoid overflowing the buffer's stream.

src/core/SkValidatingReadBuffer.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkErrorInternals.h"
 #include "SkValidatingReadBuffer.h"
@@ skipping 95 matching lines @@
     }
     return data;
 }
 
 void SkValidatingReadBuffer::readPoint(SkPoint* point) {
     point->fX = fReader.readScalar();
     point->fY = fReader.readScalar();
 }
 
 void SkValidatingReadBuffer::readMatrix(SkMatrix* matrix) {
-    const size_t size = matrix->readFromMemory(fReader.peek());
-    fError = fError || (SkAlign4(size) != size);
+    const size_t size = matrix->readFromMemory(fReader.peek(), fReader.available());
+    fError = fError || (SkAlign4(size) != size) || (0 == size);
     if (!fError) {
         (void)this->skip(size);
     }
 }
 
 void SkValidatingReadBuffer::readIRect(SkIRect* rect) {
     const void* ptr = this->skip(sizeof(SkIRect));
     if (!fError) {
         memcpy(rect, ptr, sizeof(SkIRect));
     }
 }
 
 void SkValidatingReadBuffer::readRect(SkRect* rect) {
     const void* ptr = this->skip(sizeof(SkRect));
     if (!fError) {
         memcpy(rect, ptr, sizeof(SkRect));
     }
 }
 
 void SkValidatingReadBuffer::readRegion(SkRegion* region) {
-    const size_t size = region->readFromMemory(fReader.peek());
-    fError = fError || (SkAlign4(size) != size);
+    const size_t size = region->readFromMemory(fReader.peek(), fReader.available());
+    fError = fError || (SkAlign4(size) != size) || (0 == size);
     if (!fError) {
         (void)this->skip(size);
     }
 }
 
 void SkValidatingReadBuffer::readPath(SkPath* path) {
-    const size_t size = path->readFromMemory(fReader.peek());
-    fError = fError || (SkAlign4(size) != size);
+    const size_t size = path->readFromMemory(fReader.peek(), fReader.available());
+    fError = fError || (SkAlign4(size) != size) || (0 == size);
     if (!fError) {
         (void)this->skip(size);
     }
 }
 
 uint32_t SkValidatingReadBuffer::readByteArray(void* value) {
     const uint32_t length = this->readUInt();
     const void* ptr = this->skip(SkAlign4(length));
     if (!fError) {
         memcpy(value, ptr, length);
@@ skipping 40 matching lines @@
     const uint32_t byteLength = count * sizeof(SkScalar);
     const void* ptr = this->skip(SkAlign4(byteLength));
     if (!fError) {
         memcpy(values, ptr, byteLength);
         return count;
     }
     return 0;
 }
 
 uint32_t SkValidatingReadBuffer::getArrayCount() {
+    const size_t inc = sizeof(uint32_t);
+    fError = fError || !IsPtrAlign4(fReader.peek()) || !fReader.isAvailable(inc);
     return *(uint32_t*)fReader.peek();
 }
 
 void SkValidatingReadBuffer::readBitmap(SkBitmap* bitmap) {
     const int width = this->readInt();
     const int height = this->readInt();
     const size_t length = this->readUInt();
     // A size of zero means the SkBitmap was simply flattened.
     fError = fError || (length != 0);
     if (fError) {
@@ skipping 37 matching lines @@
             delete obj;
             obj = NULL;
         }
     } else {
         // we must skip the remaining data
         this->skip(sizeRecorded);
         SkASSERT(false);
     }
     return obj;
 }