summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <teuf@gnome.org>2004-08-24 18:25:02 +0000
committerChristophe Fergeau <teuf@gnome.org>2004-08-24 18:25:02 +0000
commitce7df5b3824d61862dadc964a663f5837f1bb1a2 (patch)
treec81a4877c0333ecff2c62c8c529041da6205611d
parentefac328faa1f8d325611ac6076f5856dab785c72 (diff)
downloadgst-plugins-bad-ce7df5b3824d61862dadc964a663f5837f1bb1a2.tar.gz
gst-plugins-bad-ce7df5b3824d61862dadc964a663f5837f1bb1a2.tar.bz2
gst-plugins-bad-ce7df5b3824d61862dadc964a663f5837f1bb1a2.zip
gst-libs/gst/riff/riff-read.c: fix infinite loop in wavparse, fixes bug
Original commit message from CVS: 2004-08-24 Sebastien Cote <sc5@hermes.usherb.ca> * gst-libs/gst/riff/riff-read.c: (gst_riff_peek_head), (gst_riff_read_element_data), (gst_riff_read_seek), (gst_riff_read_skip): fix infinite loop in wavparse, fixes bug #144616, patch reviewed by Ronald and committed by Christophe Fergeau <teuf@gnome.org>
-rw-r--r--ChangeLog8
-rw-r--r--gst-libs/gst/riff/riff-read.c14
2 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e7f2e394..35f72a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-24 Sebastien Cote <sc5@hermes.usherb.ca>
+
+ * gst-libs/gst/riff/riff-read.c: (gst_riff_peek_head),
+ (gst_riff_read_element_data), (gst_riff_read_seek),
+ (gst_riff_read_skip): fix infinite loop in wavparse, fixes bug
+ #144616, patch reviewed by Ronald and committed by Christophe Fergeau
+ <teuf@gnome.org>
+
2004-08-23 Iain <iaingnome@gmail.com>
* ext/mad/gstid3tag.c (gst_mad_id3_to_tag_list): Special case COMM
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 11740f2a..3cfe634a 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -179,7 +179,7 @@ gst_riff_peek_head (GstRiffRead * riff,
/* Here, we might encounter EOS */
gst_bytestream_get_status (riff->bs, &remaining, &event);
- if (GST_IS_EVENT (event)) {
+ if (event && GST_IS_EVENT (event)) {
gboolean eos = (GST_EVENT_TYPE (event) == GST_EVENT_EOS);
gst_pad_event_default (riff->sinkpad, event);
@@ -220,7 +220,7 @@ gst_riff_read_element_data (GstRiffRead * riff, guint length, guint * got_bytes)
guint32 remaining;
gst_bytestream_get_status (riff->bs, &remaining, &event);
- if (GST_IS_EVENT (event)) {
+ if (event && GST_IS_EVENT (event)) {
gst_pad_event_default (riff->sinkpad, event);
if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
@@ -276,8 +276,8 @@ gst_riff_read_seek (GstRiffRead * riff, guint64 offset)
gst_bytestream_get_status (riff->bs, &remaining, &event);
if (event) {
g_warning ("Unexpected event before seek");
- gst_event_unref (event);
}
+
if (remaining)
gst_bytestream_flush_fast (riff->bs, remaining);
@@ -376,9 +376,13 @@ gst_riff_read_skip (GstRiffRead * riff)
/* see if we have that much data available */
gst_bytestream_get_status (riff->bs, &remaining, &event);
- if (event) {
+ if (event && GST_IS_EVENT (event)) {
+ gboolean eos = (GST_EVENT_TYPE (event) == GST_EVENT_EOS);
+
g_warning ("Unexpected event in skip");
- gst_event_unref (event);
+ gst_pad_event_default (riff->sinkpad, event);
+ if (eos)
+ return FALSE;
}
/* yes */