Adding size parameter to read array functions

src/core/SkFlattenableBuffers.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkFlattenableBuffers.h"
 #include "SkPaint.h"
 #include "SkTypeface.h"
@@ skipping 19 matching lines @@
     if (8 == sizeof(void*)) {
         fFlags |= kPtrIs64Bit_Flag;
     }
 }
 
 SkFlattenableReadBuffer::~SkFlattenableReadBuffer() { }
 
 void* SkFlattenableReadBuffer::readFunctionPtr() {
     void* proc;
     SkASSERT(sizeof(void*) == this->getArrayCount());
-    this->readByteArray(&proc);
+    this->readByteArray(&proc, sizeof(void*));

[Tom Sepez, 2013/11/08 20:59:01]

drive-by: Code like this always scares the crap out of us, because although it
looks like this may not get called in the inter-process case based upon flags in
the current implementation, something might change introducing the easiest
possible escape ever. Please try to remove this and use another mechanism even
in the intra-process case.
Besides, the code is not correct in that casting a function to void* is wrong
per C specs (see e.g.
http://stackoverflow.com/questions/1096341/function-pointers-casting-in-c).

[sugoi, 2013/11/08 21:31:16]

Thanks for your comment ! Yes, code like this was one of the main motivations
for the rewrite of a new more secure serialization class in skia (see
SkValidatingReadBuffer). The original serialization code in Skia was written for
speed, not for security, which is why it had to be redesigned and rewritten. If
performance allows it, maybe we could eventually modify Skia to only use the
secure serialization, but there's still code using the old one for now (in Skia,
not in Chromium, AFAIK). Maybe we could find a way to make these functions only
accessible in Skia (as in #ifdefed out and not even compiled in Chrome, since
Chrome will not use this). What do you think ?

     return proc;
 }
 
 void SkFlattenableReadBuffer::readPaint(SkPaint* paint) {
     paint->unflatten(*this);
 }
 
 template <typename T> T* SkFlattenableReadBuffer::readFlattenableT() {
     return static_cast<T*>(this->readFlattenable(T::GetFlattenableType()));
 }
@@ skipping 52 matching lines @@
 }
 
 void SkFlattenableWriteBuffer::writePaint(const SkPaint& paint) {
     paint.flatten(*this);
 }
 
 void SkFlattenableWriteBuffer::flattenObject(const SkFlattenable* obj,
                                              SkFlattenableWriteBuffer& buffer) {
     obj->flatten(buffer);
 }