From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Thu, 8 Nov 2007 23:17:10 +0000 (+0000)
Subject: more robust rtp plus tag parsing
X-Git-Tag: 2.6.0~1752
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/80f0ae4f5b0e4b8d5b8170512b2f9c5071edfcb2

more robust rtp plus tag parsing
---

diff --git a/lib/dvb/radiotext.cpp b/lib/dvb/radiotext.cpp
index eff40e92..3e057194 100644
--- a/lib/dvb/radiotext.cpp
+++ b/lib/dvb/radiotext.cpp
@@ -562,14 +562,20 @@ inline void eDVBRdsDecoder::gotAncillaryData(__u8 *buf, int len)
 					rtp_len[1]   = 0x1f & rtp_buf[4];
 									
 					unsigned char rtplus_osd_tmp[64];
-									
-					memcpy(rtp_item[rtp_typ[0]],lastmessage+rtp_start[0],rtp_len[0]+1);
-					rtp_item[rtp_typ[0]][rtp_len[0]+1]=0;
+					
+					if (rtp_start[0] < 66 && (rtp_len[0]+rtp_start[0]) < 66)
+					{
+						memcpy(rtp_item[rtp_typ[0]],lastmessage+rtp_start[0],rtp_len[0]+1);
+						rtp_item[rtp_typ[0]][rtp_len[0]+1]=0;
+					}
 									
 					if (rtp_typ[0] != rtp_typ[1])
 					{
-						memcpy(rtp_item[rtp_typ[1]],lastmessage+rtp_start[1],rtp_len[1]+1);
-						rtp_item[rtp_typ[1]][rtp_len[1]+1]=0;
+						if (rtp_start[1] < 66 && (rtp_len[1]+rtp_start[1]) < 66)
+						{
+							memcpy(rtp_item[rtp_typ[1]],lastmessage+rtp_start[1],rtp_len[1]+1);
+							rtp_item[rtp_typ[1]][rtp_len[1]+1]=0;
+						}
 					}
 
 					// main RTPlus item_types used by the radio stations: