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

include/core/SkRegion.h

 
 /*
  * Copyright 2005 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 SkRegion_DEFINED
@@ skipping 343 matching lines @@
     private:
         const SkRegion::RunType* fRuns;
         int     fLeft, fRight;
         bool    fDone;
     };
 
     /**
      *  Write the region to the buffer, and return the number of bytes written.
      *  If buffer is NULL, it still returns the number of bytes.
      */
-    uint32_t writeToMemory(void* buffer) const;
-
+    size_t writeToMemory(void* buffer) const;
     /**
-     *  Initialized the region from the buffer, returning the number
-     *  of bytes actually read.
+     * Initializes the region from the buffer
+     *
+     * @param buffer Memory to read from
+     * @param length Amount of memory available in the buffer
+     * @return number of bytes read (must be a multiple of 4) or
+     *         0 if there was not enough memory available
      */
-    uint32_t readFromMemory(const void* buffer);
+    size_t readFromMemory(const void* buffer, size_t length);
 
     /**
      *  Returns a reference to a global empty region. Just a convenience for
      *  callers that need a const empty region.
      */
     static const SkRegion& GetEmptyRegion();
 
     SkDEBUGCODE(void dump() const;)
     SkDEBUGCODE(void validate() const;)
     SkDEBUGCODE(static void UnitTest();)
@@ skipping 56 matching lines @@
     static bool Oper(const SkRegion&, const SkRegion&, SkRegion::Op, SkRegion*);
 
     friend struct RunHead;
     friend class Iterator;
     friend class Spanerator;
     friend class SkRgnBuilder;
     friend class SkFlatRegion;
 };
 
 #endif