diff --git a/ChangeLog b/ChangeLog
index 9bf044d679..3f7d2d68db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-12  Colin Walters  <walters@redhat.com>
+
+	* gst/asfdemux/gstasfdemux.c (gst_asf_demux_process_segment): Avoid
+	inflooping if we can't find a chunk.  Or in other words, don't blow
+	chunks if we don't have a chunk to blow.
+
 2004-05-13  Jan Schmidt  <thaytan@mad.scientist.com>
 	* ext/audiofile/gstafsrc.c: (gst_afsrc_get):
 	Remove old debug output
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index a5fc0ff6bf..82cffdf636 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -705,13 +705,15 @@ gst_asf_demux_process_segment (GstASFDemux * asf_demux,
         return FALSE;
       }
 
-      gst_asf_demux_process_chunk (asf_demux, packet_info, &segment_info);
+      if (!gst_asf_demux_process_chunk (asf_demux, packet_info, &segment_info))
+	return FALSE;
 
       frag_size -= segment_info.chunk_size + 1;
     }
   } else {
     segment_info.chunk_size = frag_size;
-    gst_asf_demux_process_chunk (asf_demux, packet_info, &segment_info);
+    if (!gst_asf_demux_process_chunk (asf_demux, packet_info, &segment_info))
+      return FALSE;
   }
 
   return TRUE;