summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/matroska/matroska-demux.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fc8a4018..b4d45b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-12-18 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst/matroska/matroska-demux.c:
+ (gst_matroska_demux_parse_blockgroup):
+ Fix possible crasher.
+
+2004-12-18 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* gst/matroska/matroska-demux.c: (gst_matroska_ebmlnum_uint),
(gst_matroska_ebmlnum_sint), (gst_matroska_demux_parse_blockgroup):
Lace sizes can be zero.
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 03ba7ce1..e4353c4a 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1884,7 +1884,8 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux * demux,
lace_size[n] = lace_size[n - 1] + snum;
total += lace_size[n];
}
- lace_size[n] = size - total;
+ if (n < laces)
+ lace_size[n] = size - total;
break;
}
}