diff --git a/ChangeLog b/ChangeLog
index 330d3aa555..bbb22ddc71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-23  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
+	  Fix buffer overflow read error.
+
 2004-03-23  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/alsa/gstalsa.h:
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 4e5b9b004e..a4152dea29 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -330,7 +330,7 @@ gst_mp3parse_chain (GstPad * pad, GstData * _data)
     GST_DEBUG ("mp3parse: offset %ld, size %ld ", offset, size);
 
     /* search for a possible start byte */
-    for (; ((data[offset] != 0xff) && (offset < size)); offset++)
+    for (; ((offset < size - 4) && (data[offset] != 0xff)); offset++)
       skipped++;
     if (skipped && !mp3parse->in_flush) {
       GST_DEBUG ("mp3parse: **** now at %ld skipped %d bytes", offset, skipped);