diff --git a/ChangeLog b/ChangeLog
index 984493af98..a73a1d2c40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-17  Michael Smith  <msmith@fluendo.com>
+
+	* gst/typefind/gsttypefindfunctions.c: (ogganx_type_find):
+	  Don't crash on truncated files - check that we got an 8 byte buffer
+	  before trying to memcmp it.
+
 2006-09-17  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/playback/gstplaybasebin.c: (get_active_source):
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index bc7c2bc82d..d44102efa9 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -1953,7 +1953,7 @@ ogganx_type_find (GstTypeFind * tf, gpointer private)
 
     /* Check for an annodex fishbone header */
     data = gst_type_find_peek (tf, 28, 8);
-    if (memcmp (data, "fishead\0", 8) == 0)
+    if (data && memcmp (data, "fishead\0", 8) == 0)
       gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, OGGANX_CAPS);
 
     gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM,