From 4b3fec660a5a8da7f52a0779e0b883de6d787287 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 15 Mar 2019 16:28:16 +0100
Subject: Fixed processing SI::T2DeliverySystemDescriptor when typecasting it
 over an SI::ExtensionDescriptor

---
 libsi/descriptor.c | 7 ++++++-
 libsi/descriptor.h | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'libsi')

diff --git a/libsi/descriptor.c b/libsi/descriptor.c
index f763d62b..6b00fc77 100644
--- a/libsi/descriptor.c
+++ b/libsi/descriptor.c
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.c 3.1 2013/10/30 10:16:18 kls Exp $
+ *   $Id: descriptor.c 4.1 2019/03/15 16:12:43 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -870,6 +870,11 @@ int S2SatelliteDeliverySystemDescriptor::getScramblingSequenceIndex() const {
 void ExtensionDescriptor::Parse() {
    int offset=0;
    data.setPointerAndOffset<const descr_extension>(s, offset);
+   extended_data_flag = s->descriptor_length > 0x04;
+}
+
+int ExtensionDescriptor::getExtendedDataFlag() const {
+  return extended_data_flag;
 }
 
 int ExtensionDescriptor::getExtensionDescriptorTag() const {
diff --git a/libsi/descriptor.h b/libsi/descriptor.h
index 30c9f6b1..3c8b0f90 100644
--- a/libsi/descriptor.h
+++ b/libsi/descriptor.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: descriptor.h 3.2 2014/02/08 12:44:17 kls Exp $
+ *   $Id: descriptor.h 4.1 2019/03/15 16:12:09 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -529,11 +529,13 @@ private:
 
 class ExtensionDescriptor : public Descriptor {
 public:
+   int getExtendedDataFlag() const;
    int getExtensionDescriptorTag() const;
 protected:
    virtual void Parse();
 private:
    const descr_extension *s;
+   int extended_data_flag;
 };
 
 class T2DeliverySystemDescriptor : public Descriptor {
-- 
cgit v1.2.3