diff --git a/ChangeLog b/ChangeLog
index bb6885e5ab..6b94c8fd6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-04  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex):
+	If there's no entries in the subindex, don't try to do anything stupid,
+	just return.
+
 2008-02-02  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: John Millikin <jmillikin at gmail dot com>
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index d68b537693..5e7eacc0fe 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -979,6 +979,10 @@ gst_avi_demux_parse_subindex (GstAviDemux * avi,
   num = GST_READ_UINT32_LE (&data[4]);
   baseoff = GST_READ_UINT64_LE (&data[12]);
 
+  /* If there's nothing, just return ! */
+  if (num == 0)
+    return TRUE;
+
   if (!(entries = g_try_new (gst_avi_index_entry, num)))
     goto out_of_mem;