diff --git a/ChangeLog b/ChangeLog
index 522569c37d..8c425064db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-27  Edward Hervey  <edward@fluendo.com>
+
+	* gst-libs/gst/riff/riff-read.c: (gst_riff_parse_strf_auds):
+	Don't try to create a zero-sized subbuffer.
+
 2005-11-27  Julien MOUTTE  <julien@moutte.net>
 
 	* sys/ximage/ximagesink.c: (gst_ximage_buffer_free),
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 25a80a3630..0fc3d3e5ed 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -415,7 +415,8 @@ gst_riff_parse_strf_auds (GstElement * element,
           len, GST_BUFFER_SIZE (buf) - 2 - sizeof (gst_riff_strf_auds));
       len = GST_BUFFER_SIZE (buf) - 2 - sizeof (gst_riff_strf_auds);
     }
-    *data = gst_buffer_create_sub (buf, sizeof (gst_riff_strf_auds) + 2, len);
+    if (len)
+      *data = gst_buffer_create_sub (buf, sizeof (gst_riff_strf_auds) + 2, len);
   }
 
   /* debug */