summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-core/dvb_demux.c
diff options
context:
space:
mode:
authorMark Adams <mark147m@gmail.com>2005-11-08 21:35:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:05 -0800
commitb3967d6c251d8482fe42a1aad3cc292ee04c0a6b (patch)
treeb885c08047d209504a4b774bc07b641c51a8721e /drivers/media/dvb/dvb-core/dvb_demux.c
parentf0fa86a574843264bdcbed4c84b41a2778861fde (diff)
downloadop-kernel-dev-b3967d6c251d8482fe42a1aad3cc292ee04c0a6b.zip
op-kernel-dev-b3967d6c251d8482fe42a1aad3cc292ee04c0a6b.tar.gz
[PATCH] dvb: fix bug in demux that caused lost mpeg sections
Fix a bug in the software demux which causes large MPEG sections to be lost when they follow very small sections. The problem happens when two sections begin in the same transport packet. The dvb_demux code resets its buffer only before the first of these sections. This means that when the second (or subsequent) section begins, there is up to 182 bytes of buffer space already used. If the following section is close to the maximum size, it currently won't fit in the (4096-byte) buffer and is thrown away. The fix is simply to enlarge the buffer by the size of one transport packet and correct one usage of the SECFEED_SIZE definition where what is really meant is the maximum size of a section. Signed-off-by: Mark Adams <mark147m@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Cc: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/dvb-core/dvb_demux.c')
-rw-r--r--drivers/media/dvb/dvb-core/dvb_demux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index dc476dd..b4c899b 100644
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -246,7 +246,7 @@ static int dvb_dmx_swfilter_section_copy_dump(struct dvb_demux_feed *feed,
for (n = 0; sec->secbufp + 2 < limit; n++) {
seclen = section_length(sec->secbuf);
- if (seclen <= 0 || seclen > DMX_MAX_SECFEED_SIZE
+ if (seclen <= 0 || seclen > DMX_MAX_SECTION_SIZE
|| seclen + sec->secbufp > limit)
return 0;
sec->seclen = seclen;
OpenPOWER on IntegriCloud