From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 17 Nov 2008 16:19:06 +0000 (+0100)
Subject: fix comment, don't memmem over end of packet
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=a9efd192b545113282c7c7891a231570f49f27e6;ds=sidebyside

fix comment, don't memmem over end of packet
---

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 3ad086d..07cc611 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -973,7 +973,7 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 	}
 #endif
 
-#if 1 /* not yet */
+#if 1 /* This codepath is required on Broadcom-based Dreamboxes (DM800, DM8000) and strips away non-I-frames. */
 	if (!m_iframe_search)
 		return len;
 
@@ -982,7 +982,7 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 //	eDebug("filterRecordData, size=%d (mod 188=%d), first byte is %02x", len, len %188, data[0]);
 
 	unsigned char *d = data;
-	while ((d = (unsigned char*)memmem(d, data + len - d, "\x00\x00\x01", 3)))
+	while ((d + 3 < data + len) && (d = (unsigned char*)memmem(d, data + len - d, "\x00\x00\x01", 3)))
 	{
 		int offset = d - data;
 		int ts_offset = offset - offset % 188; /* offset to the start of TS packet */
@@ -1054,7 +1054,6 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 			d += 4;
 		} else
 			d += 4; /* ignore */
-
 	}
 
 	if (m_iframe_state == 1)