frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling improperly formatted EIT data

Browse Source
This commit is contained in:
Klaus Schmidinger 2002-01-30 18:31:34 +01:00
parent 7803f04b8e
commit a2c2926079
4 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -926,3 +926,7 @@ Video Disk Recorder Revision History
- Fixed handling improper buffer lengths in the EIT parser (thanks to Deti - Fixed handling improper buffer lengths in the EIT parser (thanks to Deti
Fliegl). Fliegl).
2002-01-30: Version 0.99pre4
- Fixed handling improperly formatted EIT data (thanks to Rolf Hakenes).

4
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 1.89 2002/01/29 21:53:32 kls Exp $ * $Id: config.h 1.90 2002/01/30 18:30:03 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -18,7 +18,7 @@
#include "eit.h" #include "eit.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "0.99pre3" #define VDRVERSION "0.99pre4"
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

34
libdtv/libsi/include/libsi.h
View File

@ -4,8 +4,8 @@
/// /// /// ///
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
// $Revision: 1.4 $ // $Revision: 1.6 $
// $Date: 2001/10/07 10:24:46 $ // $Date: 2002/01/30 17:04:13 $
// $Author: hakenes $ // $Author: hakenes $
// //
// (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL. // (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
@ -32,6 +32,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <asm/types.h> #include <asm/types.h>
#define dvb_pid_t int
/* Program Identifier */ /* Program Identifier */
@ -274,7 +276,7 @@ struct Pid {
struct PidInfo { struct PidInfo {
struct NODE Node; struct NODE Node;
int StreamType; int StreamType;
int ElementaryPid; dvb_pid_t ElementaryPid;
struct LIST *Descriptors; struct LIST *Descriptors;
}; };
@ -283,7 +285,7 @@ struct PidInfo {
{ \ { \
xCreateNode (pidinfo, NULL); \ xCreateNode (pidinfo, NULL); \
pidinfo->StreamType = styp; \ pidinfo->StreamType = styp; \
pidinfo->ElementaryPid = epid; \ pidinfo->ElementaryPid = (dvb_pid_t) epid; \
pidinfo->Descriptors = xNewList (NULL); \ pidinfo->Descriptors = xNewList (NULL); \
} while (0) } while (0)
@ -418,7 +420,9 @@ struct BouquetNameDescriptor {
#define CreateBouquetNameDescriptor(descr, text) \ #define CreateBouquetNameDescriptor(descr, text) \
do \ do \
{ \ { \
xCreateNode (((struct BouquetNameDescriptor *)descr), text); \ xCreateNode (((struct BouquetNameDescriptor *)descr), NULL); \
((struct NODE *)descr)->Name = text; \
((struct NODE *)descr)->HashKey = xHashKey (text); \
((struct BouquetNameDescriptor *)descr)->Tag = DESCR_BOUQUET_NAME; \ ((struct BouquetNameDescriptor *)descr)->Tag = DESCR_BOUQUET_NAME; \
} while (0) } while (0)
@ -613,7 +617,9 @@ struct ServiceDescriptor {
#define CreateServiceDescriptor(descr, styp, prov, name) \ #define CreateServiceDescriptor(descr, styp, prov, name) \
do \ do \
{ \ { \
xCreateNode (((struct ServiceDescriptor *)descr), name); \ xCreateNode (((struct ServiceDescriptor *)descr), NULL); \
((struct NODE *)descr)->Name = name; \
((struct NODE *)descr)->HashKey = xHashKey (name); \
((struct ServiceDescriptor *)descr)->Tag = DESCR_SERVICE; \ ((struct ServiceDescriptor *)descr)->Tag = DESCR_SERVICE; \
((struct ServiceDescriptor *)descr)->ServiceType = styp; \ ((struct ServiceDescriptor *)descr)->ServiceType = styp; \
((struct ServiceDescriptor *)descr)->ServiceProvider = prov; \ ((struct ServiceDescriptor *)descr)->ServiceProvider = prov; \
@ -678,7 +684,9 @@ struct ComponentDescriptor {
#define CreateComponentDescriptor(descr, scnt, ctyp, tag, lc1, lc2, lc3, txt) \ #define CreateComponentDescriptor(descr, scnt, ctyp, tag, lc1, lc2, lc3, txt) \
do \ do \
{ \ { \
xCreateNode (((struct ComponentDescriptor *)descr), txt); \ xCreateNode (((struct ComponentDescriptor *)descr), NULL); \
((struct NODE *)descr)->Name = txt; \
((struct NODE *)descr)->HashKey = xHashKey (txt); \
((struct ComponentDescriptor *)descr)->Tag = DESCR_COMPONENT; \ ((struct ComponentDescriptor *)descr)->Tag = DESCR_COMPONENT; \
((struct ComponentDescriptor *)descr)->StreamContent = scnt; \ ((struct ComponentDescriptor *)descr)->StreamContent = scnt; \
((struct ComponentDescriptor *)descr)->ComponentType = ctyp; \ ((struct ComponentDescriptor *)descr)->ComponentType = ctyp; \
@ -735,7 +743,9 @@ struct ExtendedEventDescriptor {
#define CreateExtendedEventDescriptor(descr, dnum, ldnb, lc1, lc2, lc3, text) \ #define CreateExtendedEventDescriptor(descr, dnum, ldnb, lc1, lc2, lc3, text) \
do \ do \
{ \ { \
xCreateNode (((struct ExtendedEventDescriptor *)descr), text); \ xCreateNode (((struct ExtendedEventDescriptor *)descr), NULL); \
((struct NODE *)descr)->Name = text; \
((struct NODE *)descr)->HashKey = xHashKey (text); \
((struct ExtendedEventDescriptor *)descr)->Tag = DESCR_EXTENDED_EVENT; \ ((struct ExtendedEventDescriptor *)descr)->Tag = DESCR_EXTENDED_EVENT; \
((struct ExtendedEventDescriptor *)descr)->DescriptorNumber = dnum; \ ((struct ExtendedEventDescriptor *)descr)->DescriptorNumber = dnum; \
((struct ExtendedEventDescriptor *)descr)->LastDescriptorNumber = ldnb; \ ((struct ExtendedEventDescriptor *)descr)->LastDescriptorNumber = ldnb; \
@ -754,7 +764,9 @@ struct ExtendedEventItem {
#define CreateExtendedEventItem(itm, dtxt, text) \ #define CreateExtendedEventItem(itm, dtxt, text) \
do \ do \
{ \ { \
xCreateNode (itm, dtxt); \ xCreateNode (itm, NULL); \
((struct NODE *)itm)->Name = dtxt; \
((struct NODE *)itm)->HashKey = xHashKey (dtxt); \
itm->Text = text; \ itm->Text = text; \
} while (0) } while (0)
@ -822,7 +834,9 @@ struct ShortEventDescriptor {
#define CreateShortEventDescriptor(descr, name, lc1, lc2, lc3, text) \ #define CreateShortEventDescriptor(descr, name, lc1, lc2, lc3, text) \
do \ do \
{ \ { \
xCreateNode (((struct ShortEventDescriptor *)descr), name); \ xCreateNode (((struct ShortEventDescriptor *)descr), NULL); \
((struct NODE *)descr)->Name = name; \
((struct NODE *)descr)->HashKey = xHashKey (name); \
((struct ShortEventDescriptor *)descr)->Tag = DESCR_SHORT_EVENT; \ ((struct ShortEventDescriptor *)descr)->Tag = DESCR_SHORT_EVENT; \
((struct ShortEventDescriptor *)descr)->LanguageCode[0] = lc1; \ ((struct ShortEventDescriptor *)descr)->LanguageCode[0] = lc1; \
((struct ShortEventDescriptor *)descr)->LanguageCode[1] = lc2; \ ((struct ShortEventDescriptor *)descr)->LanguageCode[1] = lc2; \

28
libdtv/libsi/si_parser.c
View File

@ -4,8 +4,8 @@
/// /// /// ///
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
// $Revision: 1.4 $ // $Revision: 1.6 $
// $Date: 2001/10/07 10:24:46 $ // $Date: 2002/01/30 17:04:13 $
// $Author: hakenes $ // $Author: hakenes $
// //
// (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL. // (C) 2001 Rolf Hakenes <hakenes@hippomi.de>, under the GNU GPL.
@ -119,7 +119,8 @@ struct Pid *siParsePMT (u_char *Buffer)
CreatePid (Pid, ProgramID, PcrID, PmtVersion); CreatePid (Pid, ProgramID, PcrID, PmtVersion);
siParseDescriptors (Pid->Descriptors, Ptr, ProgramInfoLength, Pmt->table_id); if (StreamLength >= 0) siParseDescriptors (Pid->Descriptors, Ptr,
ProgramInfoLength, Pmt->table_id);
Ptr += ProgramInfoLength; Ptr += ProgramInfoLength;
@ -209,6 +210,8 @@ struct LIST *siParseSDT (u_char *Buffer)
SetPresentFollowing (Service->Status); SetPresentFollowing (Service->Status);
LoopLength = HILO (SdtDescriptor->descriptors_loop_length); LoopLength = HILO (SdtDescriptor->descriptors_loop_length);
if (LoopLength > SectionLength - SDT_DESCR_LEN)
return (ServiceList);
Ptr += SDT_DESCR_LEN; Ptr += SDT_DESCR_LEN;
siParseDescriptors (Service->Descriptors, Ptr, LoopLength, Sdt->table_id); siParseDescriptors (Service->Descriptors, Ptr, LoopLength, Sdt->table_id);
@ -297,6 +300,8 @@ struct LIST *siParseEIT (u_char *Buffer)
Event->Duration = BcdTimeToSeconds (EitEvent->duration); Event->Duration = BcdTimeToSeconds (EitEvent->duration);
LoopLength = HILO (EitEvent->descriptors_loop_length); LoopLength = HILO (EitEvent->descriptors_loop_length);
if (LoopLength > SectionLength - EIT_EVENT_LEN)
return (EventList);
Ptr += EIT_EVENT_LEN; Ptr += EIT_EVENT_LEN;
siParseDescriptors (Event->Descriptors, Ptr, LoopLength, Eit->table_id); siParseDescriptors (Event->Descriptors, Ptr, LoopLength, Eit->table_id);
@ -349,6 +354,8 @@ void siParseDescriptors (struct LIST *Descriptors, u_char *Buffer,
while (DescriptorLength < Length) while (DescriptorLength < Length)
{ {
if ((GetDescriptorLength (Ptr) > Length - DescriptorLength) ||
(GetDescriptorLength (Ptr) <= 0)) return;
switch (TableID) switch (TableID)
{ {
case TID_NIT_ACT: case TID_NIT_OTH: case TID_NIT_ACT: case TID_NIT_OTH:
@ -554,7 +561,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
Text = siGetDescriptorText (Buffer + DESCR_BOUQUET_NAME_LEN, Text = siGetDescriptorText (Buffer + DESCR_BOUQUET_NAME_LEN,
GetDescriptorLength (Buffer) - DESCR_BOUQUET_NAME_LEN); GetDescriptorLength (Buffer) - DESCR_BOUQUET_NAME_LEN);
CreateBouquetNameDescriptor (Descriptor, Text); CreateBouquetNameDescriptor (Descriptor, Text);
// xMemFree (Text);
break; break;
case DESCR_COMPONENT: case DESCR_COMPONENT:
@ -567,7 +573,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
CastComponentDescriptor(Buffer)->lang_code1, CastComponentDescriptor(Buffer)->lang_code1,
CastComponentDescriptor(Buffer)->lang_code2, CastComponentDescriptor(Buffer)->lang_code2,
CastComponentDescriptor(Buffer)->lang_code3, Text); CastComponentDescriptor(Buffer)->lang_code3, Text);
// xMemFree (Text);
break; break;
case DESCR_SERVICE: case DESCR_SERVICE:
@ -579,7 +584,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
CastServiceDescriptor(Buffer)->provider_name_length))); CastServiceDescriptor(Buffer)->provider_name_length)));
CreateServiceDescriptor (Descriptor, CreateServiceDescriptor (Descriptor,
CastServiceDescriptor(Buffer)->service_type, Text, Text2); CastServiceDescriptor(Buffer)->service_type, Text, Text2);
// xMemFree (Text2);
break; break;
case DESCR_COUNTRY_AVAIL: case DESCR_COUNTRY_AVAIL:
@ -603,7 +607,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
CastShortEventDescriptor(Buffer)->lang_code1, CastShortEventDescriptor(Buffer)->lang_code1,
CastShortEventDescriptor(Buffer)->lang_code2, CastShortEventDescriptor(Buffer)->lang_code2,
CastShortEventDescriptor(Buffer)->lang_code3, Text2); CastShortEventDescriptor(Buffer)->lang_code3, Text2);
// xMemFree (Text);
break; break;
case DESCR_EXTENDED_EVENT: case DESCR_EXTENDED_EVENT:
@ -617,10 +620,9 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
CastExtendedEventDescriptor(Buffer)->lang_code1, CastExtendedEventDescriptor(Buffer)->lang_code1,
CastExtendedEventDescriptor(Buffer)->lang_code2, CastExtendedEventDescriptor(Buffer)->lang_code2,
CastExtendedEventDescriptor(Buffer)->lang_code3, Text); CastExtendedEventDescriptor(Buffer)->lang_code3, Text);
// xMemFree (Text);
Length = CastExtendedEventDescriptor(Buffer)->length_of_items; Length = CastExtendedEventDescriptor(Buffer)->length_of_items;
Ptr += DESCR_EXTENDED_EVENT_LEN; Ptr += DESCR_EXTENDED_EVENT_LEN;
while (Length > 0) while ((Length > 0) && (Length < GetDescriptorLength (Buffer)))
{ {
Text = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN, Text = siGetDescriptorText (Ptr + ITEM_EXTENDED_EVENT_LEN,
CastExtendedEventItem(Ptr)->item_description_length); CastExtendedEventItem(Ptr)->item_description_length);
@ -629,7 +631,6 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
*((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN + *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
CastExtendedEventItem(Ptr)->item_description_length))); CastExtendedEventItem(Ptr)->item_description_length)));
AddExtendedEventItem (Descriptor, Text2, Text); AddExtendedEventItem (Descriptor, Text2, Text);
// xMemFree (Text2);
Length -= ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length + Length -= ITEM_EXTENDED_EVENT_LEN + CastExtendedEventItem(Ptr)->item_description_length +
*((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN + *((u_char *)(Ptr + ITEM_EXTENDED_EVENT_LEN +
CastExtendedEventItem(Ptr)->item_description_length)) + 1; CastExtendedEventItem(Ptr)->item_description_length)) + 1;
@ -760,7 +761,7 @@ void siParseDescriptor (struct LIST *Descriptors, u_char *Buffer)
ASVC_FLAG, CastAc3Descriptor(Buffer)->asvc); } ASVC_FLAG, CastAc3Descriptor(Buffer)->asvc); }
Length -= DESCR_AC3_LEN; Length -= DESCR_AC3_LEN;
Ptr += DESCR_AC3_LEN; Ptr += DESCR_AC3_LEN;
if (Length) AddAc3AdditionalData (Descriptor, Ptr, Length); if (Length > 0) AddAc3AdditionalData (Descriptor, Ptr, Length);
break; break;
case DESCR_SUBTITLING: case DESCR_SUBTITLING:
@ -843,6 +844,8 @@ char *siGetDescriptorText (u_char *Buffer, int Length)
char *tmp, *result; char *tmp, *result;
int i; int i;
if ((Length < 0) || (Length > 4095))
return (xSetText ("text error"));
if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff)) if (*Buffer == 0x05 || (*Buffer >= 0x20 && *Buffer <= 0xff))
{ {
xMemAlloc (Length+1, &result); xMemAlloc (Length+1, &result);
@ -852,9 +855,8 @@ char *siGetDescriptorText (u_char *Buffer, int Length)
if (*Buffer == 0) break; if (*Buffer == 0) break;
if ((*Buffer >= ' ' && *Buffer <= '~') || if ((*Buffer >= ' ' && *Buffer <= '~') ||
(*Buffer == '\n') ||
(*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer; (*Buffer >= 0xa0 && *Buffer <= 0xff)) *tmp++ = *Buffer;
if (*Buffer == 0x8A) *tmp++ = '\n'; if (*Buffer == 0x8A || *Buffer == '\n') *tmp++ = '\n';
if (*Buffer == 0x86 || *Buffer == 0x87) *tmp++ = ' '; if (*Buffer == 0x86 || *Buffer == 0x87) *tmp++ = ' ';
Buffer++; Buffer++;
} }