commit dc9c4d93cd0f3ac991f32df08c1c17fc389054c0
author Behdad Esfahbod <behdad@behdad.org> Tue Aug 04 12:26:26 2009 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon Nov 02 14:40:28 2009 -0500
tree e2d0137c24b863bd7278cb8e96e42b198108faa4
parent ad3a3cd4955661c591b20af1f2c493432f0bebf0

[HB] Sanitize DeviceTable

src/hb-open-types-private.hh

diff --git a/src/hb-open-types-private.hh b/src/hb-open-types-private.hh
index bc9bf86..2c39c35 100644
--- a/src/hb-open-types-private.hh
+++ b/src/hb-open-types-private.hh
@@ -76,7 +76,7 @@
 
 #define SANITIZE_SELF() SANITIZE_OBJ (*this)
 #define SANITIZE_OBJ(X) SANITIZE_MEM(&(X), sizeof (X))
-#define SANITIZE_GET_SIZE() SANITIZE_MEM (this, this->get_size ())
+#define SANITIZE_GET_SIZE() SANITIZE_SELF() && SANITIZE_MEM (this, this->get_size ())
 
 #define SANITIZE_MEM(B,L) HB_LIKELY (context->start <= CONST_CHARP(B) && CONST_CHARP(B) + (L) <= context->end) /* XXX overflow */
 
@@ -376,7 +376,7 @@
   { return sizeof (len) + len * sizeof (array[0]); }
 
   inline bool sanitize (SANITIZE_ARG_DEF) {
-    if (!(SANITIZE (len) && SANITIZE_GET_SIZE())) return false;
+    if (!SANITIZE_GET_SIZE()) return false;
     /* Note; for non-recursive types, this is not much needed
     unsigned int count = len;
     for (unsigned int i = 0; i < count; i++)
@@ -385,7 +385,7 @@
     */
   }
   inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
-    if (!(SANITIZE (len) && SANITIZE_GET_SIZE())) return false;
+    if (!SANITIZE_GET_SIZE()) return false;
     unsigned int count = len;
     for (unsigned int i = 0; i < count; i++)
       if (!array[i].sanitize (SANITIZE_ARG, base))
@@ -430,7 +430,7 @@
   { return sizeof (len) + (len ? len - 1 : 0) * sizeof (array[0]); }
 
   inline bool sanitize (SANITIZE_ARG_DEF) {
-    if (!(SANITIZE_SELF () && SANITIZE_GET_SIZE())) return false;
+    if (!SANITIZE_GET_SIZE()) return false;
     unsigned int count = len ? len - 1 : 0;
     /* Note; for non-recursive types, this is not much needed
     for (unsigned int i = 0; i < count; i++)