4 files changed, 17 insertions, 4 deletions
diff --git a/ext/audiofile/gstaftypes.c b/ext/audiofile/gstaftypes.c
index 8765f2b5..26832d76 100644
--- a/ext/audiofile/gstaftypes.c
+++ b/ext/audiofile/gstaftypes.c
@@ -58,7 +58,7 @@ gst_aftypes_type_find(GstBuffer *buf, gpointer private)
   int file_format, format_version;
   gchar *type;
 
-  g_print("calling gst_aftypes_type_find\n");
+  GST_DEBUG("calling gst_aftypes_type_find");
 
   buffer_wrap->buffer = buf;
   buffer_wrap->offset = 0;
@@ -76,7 +76,7 @@ gst_aftypes_type_find(GstBuffer *buf, gpointer private)
   file_format = afGetFileFormat (file, &format_version);
   afCloseFile (file);
 
-  g_print("file format: %d\n", file_format);
+  GST_DEBUG("file format: %d", file_format);
 
   /* reject raw data, just in case it is some other format */
   if (file_format == AF_FILE_UNKNOWN ||
diff --git a/ext/ivorbis/vorbis.c b/ext/ivorbis/vorbis.c
index 4a95c14e..65ef4b06 100644
--- a/ext/ivorbis/vorbis.c
+++ b/ext/ivorbis/vorbis.c
@@ -83,7 +83,12 @@ static GstTypeDefinition vorbisdefinition = {
 static GstCaps* 
 vorbis_type_find (GstBuffer *buf, gpointer private) 
 {
-  guint32 head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
+  guint32 head;
+    
+  if (GST_BUFFER_SIZE (buf) < 4)
+    return NULL;
+
+  head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
 
   if (head  != 0x4F676753)
     return NULL;
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index e56b9da1..a052fe7a 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -631,6 +631,9 @@ swf_type_find(GstBuffer *buf, gpointer private)
 {
 	gchar *data = GST_BUFFER_DATA(buf);
 
+	if (GST_BUFFER_SIZE (buf) < 4)
+	  return NULL;
+
 	if((data[0] != 'F' && data[0] != 'C') ||
 	    data[1] != 'W' || data[2] != 'S')return NULL;
 
diff --git a/ext/tarkin/gsttarkin.c b/ext/tarkin/gsttarkin.c
index 69fee01a..6e9abbc1 100644
--- a/ext/tarkin/gsttarkin.c
+++ b/ext/tarkin/gsttarkin.c
@@ -69,11 +69,16 @@ static GstTypeDefinition tarkindefinition =
 static GstCaps* 
 tarkin_type_find (GstBuffer *buf, gpointer private) 
 {
-  guint32 head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
+  guint32 head;
+
+  if (GST_BUFFER_SIZE (buf) < 4)
+    return NULL;
 
   /* FIXME */
   return NULL;
   
+  head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
+
   if (head  != 0x4F676753)
     return NULL;