diff --git a/ChangeLog b/ChangeLog
index a3f1881f6..aad1dd9ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-24  Werner Lemberg  <wl@gnu.org>
+
+	* src/otvalid/otvcommn.c
+	(otv_GSUBGPOS_have_MarkAttachmentType_flag): Handle table == 0.
+
 2005-04-16  Werner Lemberg  <wl@gnu.org>
 
 	* src/cff/cffobjs.c (cff_face_init): Set default upem value in top
diff --git a/src/otvalid/otvcommn.c b/src/otvalid/otvcommn.c
index ec48475f1..1b9d77c42 100644
--- a/src/otvalid/otvcommn.c
+++ b/src/otvalid/otvcommn.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    OpenType common tables validation (body).                            */
 /*                                                                         */
-/*  Copyright 2004 by                                                      */
+/*  Copyright 2004, 2005 by                                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1019,6 +1019,9 @@
     FT_UInt   count;
 
 
+    if ( !table )
+      return 0;
+
     /* LookupList */
     p      = table + 8;
     table += FT_NEXT_USHORT( p );