commit 09766b1ec5ec55a61edbcd7a89ed3613cc92d4cb
author Behdad Esfahbod <behdad@behdad.org> Mon May 10 17:36:03 2010 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon May 10 17:36:03 2010 -0400
tree 120bbf056a289bc9212c0b3b06a2341ec55521a0
parent bea34c7cbb583cf7660776e95cab3171590b8427

Make StructAtOffset take a pointer

Is safer.

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 00ad434..5b51fa7 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -65,23 +65,23 @@
 inline Type* CastP(TObject *X)
 { return reinterpret_cast<Type*> (X); }
 
-/* StructAtOffset<T>(X,Ofs) returns the struct T& that is placed at memory
- * location of X plus Ofs bytes. */
-template<typename Type, typename TObject>
-inline const Type& StructAtOffset(const TObject &X, unsigned int offset)
-{ return * reinterpret_cast<const Type*> (CharP(&X) + offset); }
-template<typename Type, typename TObject>
-inline Type& StructAtOffset(TObject &X, unsigned int offset)
-{ return * reinterpret_cast<Type*> (CharP(&X) + offset); }
+/* StructAtOffset<T>(P,Ofs) returns the struct T& that is placed at memory
+ * location pointed to by P plus Ofs bytes. */
+template<typename Type>
+inline const Type& StructAtOffset(const void *P, unsigned int offset)
+{ return * reinterpret_cast<const Type*> (CharP(P) + offset); }
+template<typename Type>
+inline Type& StructAtOffset(void *P, unsigned int offset)
+{ return * reinterpret_cast<Type*> (CharP(P) + offset); }
 
 /* StructAfter<T>(X) returns the struct T& that is placed after X.
  * Works with X of variable size also.  X must implement get_size() */
 template<typename Type, typename TObject>
 inline const Type& StructAfter(const TObject &X)
-{ return StructAtOffset<Type>(X, X.get_size()); }
+{ return StructAtOffset<Type>(&X, X.get_size()); }
 template<typename Type, typename TObject>
 inline Type& StructAfter(TObject &X)
-{ return StructAtOffset<Type>(X, X.get_size()); }
+{ return StructAtOffset<Type>(&X, X.get_size()); }
 
 
 
@@ -472,7 +472,7 @@
   {
     unsigned int offset = *this;
     if (unlikely (!offset)) return Null(Type);
-    return StructAtOffset<Type> (*CharP(base), offset);
+    return StructAtOffset<Type> (base, offset);
   }
 
   inline bool sanitize (hb_sanitize_context_t *context, void *base) {
@@ -480,7 +480,7 @@
     if (!context->check_struct (this)) return false;
     unsigned int offset = *this;
     if (unlikely (!offset)) return true;
-    Type &obj = StructAtOffset<Type> (*CharP(base), offset);
+    Type &obj = StructAtOffset<Type> (base, offset);
     return likely (obj.sanitize (context)) || neuter (context);
   }
   template <typename T>
@@ -489,7 +489,7 @@
     if (!context->check_struct (this)) return false;
     unsigned int offset = *this;
     if (unlikely (!offset)) return true;
-    Type &obj = StructAtOffset<Type> (*CharP(base), offset);
+    Type &obj = StructAtOffset<Type> (base, offset);
     return likely (obj.sanitize (context, user_data)) || neuter (context);
   }