projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a34ef89
)
fix comment, don't memmem over end of packet
author
Felix Domke
<tmbinc@elitedvb.net>
Mon, 17 Nov 2008 16:19:06 +0000
(17:19 +0100)
committer
Felix Domke
<tmbinc@elitedvb.net>
Mon, 17 Nov 2008 16:19:06 +0000
(17:19 +0100)
lib/dvb/dvb.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index
3ad086d
..
07cc611
100644
(file)
--- 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
}
#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;
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;
// 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 */
{
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 */
d += 4;
} else
d += 4; /* ignore */
-
}
if (m_iframe_state == 1)
}
if (m_iframe_state == 1)