Have peek32 return uint32_t& to make it harder to look at more than 4 bytes.

include/core/SkWriter32.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkWriter32_DEFINED
@@ skipping 61 matching lines @@
         if (fInternal.isEmpty() && this->externalCount() + count <= fExternalLimit) {
             p = fExternal + fCount;
         } else {
             p = fInternal.append(count);
         }
 
         fCount += count;
         return p;
     }
 
-    // return the address of the 4byte int at the specified offset (which must
-    // be a multiple of 4. This does not allocate any new space, so the returned
-    // address is only valid for 1 int.
-    uint32_t* peek32(size_t offset) {
+    // Return a reference to the 4 bytes at offset, which must be a multiple of 4.
+    uint32_t& peek32(size_t offset) {
         SkASSERT(SkAlign4(offset) == offset);
         const int count = SkToInt(offset/4);
         SkASSERT(count < fCount);
 
         if (count < this->externalCount()) {
-            return fExternal + count;
+            return fExternal[count];
         }
-        return &fInternal[count - this->externalCount()];
+        return fInternal[count - this->externalCount()];
     }
 
     bool writeBool(bool value) {
         this->write32(value);
         return value;
     }
 
     void writeInt(int32_t value) {
         this->write32(value);
     }
@@ skipping 104 matching lines @@
 
     /**
      *  Computes the size (aligned to multiple of 4) need to write the string
      *  in a call to writeString(). If the length is not specified, it will be
      *  computed by calling strlen().
      */
     static size_t WriteStringSize(const char* str, size_t len = (size_t)-1);
 
     /**
      *  Move the cursor back to offset bytes from the beginning.
-     *  This has the same restrictions as peek32: offset must be <= size() and
-     *  offset must be a multiple of 4.
+     *  offset must be a multiple of 4 no greater than size().
      */
     void rewindToOffset(size_t offset) {
         SkASSERT(SkAlign4(offset) == offset);
         const int count = SkToInt(offset/4);
         if (count < this->externalCount()) {
             fInternal.setCount(0);
         } else {
             fInternal.setCount(count - this->externalCount());
         }
         fCount = count;
@@ skipping 40 matching lines @@
 
 private:
     union {
         void*   fPtrAlignment;
         double  fDoubleAlignment;
         char    fStorage[SIZE];
     } fData;
 };
 
 #endif