fix possible dvb subtitles segfault

[enigma2.git] / lib / dvb / subtitle.cpp

diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
index 0058a51c09869ef52249b10146278cbc750547e2..60d48ff7e10b6a624e6adb0286bc0431218a32bd 100644 (file)
--- a/lib/dvb/subtitle.cpp
+++ b/lib/dvb/subtitle.cpp
@@ -80,6 +80,7 @@ void eDVBSubtitleParser::subtitle_process_line(subtitle_page *page, int object_i
                                        break;
                                }
 //                             //eDebug("inserting %d bytes (into region %d)", len, region->region_id);
+//                             eDebug("put data to region_buffer %p", &(*region->region_buffer));
                                memcpy((__u8*)region->region_buffer->surface->data + region->region_width * y + x, data, len);
                        }
                        object = object->next;
@@ -287,13 +288,15 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
        segment_length |= *segment++;
        if (segment_type == 0xFF)
                return segment_length + 6;
+       if (page_id != m_composition_page_id && page_id != m_ancillary_page_id)
+               return segment_length + 6;
 //     //eDebug("have %d bytes of segment data", segment_length);
 
 //     //eDebug("page_id %d, segtype %02x", page_id, segment_type);
 
        subtitle_page *page, **ppage;
 
-       page = this->pages; ppage = &this->pages;
+       page = m_pages; ppage = &m_pages;
 
        while (page)
        {
@@ -337,7 +340,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
                                // if no update, just skip this data.
                        if (page->page_version_number == page_version_number)
                        {
-                               eDebug("skip data... ");
+//                             eDebug("skip data... ");
                                break;
                        }
                }
@@ -427,6 +430,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
                {
                        *pregion = region = new subtitle_region;
                        region->next = 0;
+                       region->committed = false;
                }
                else if (region->region_version_number != region_version_number)
                {
@@ -439,10 +443,10 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
                        }
                        if (region->region_buffer)
                        {
-                               if (region->region_buffer->surface)
-                                       delete region->region_buffer->surface;
+//                             eDebug("no more need of region_buffer %p", &(*region->region_buffer));
                                region->region_buffer=0;
                        }
+                       region->committed = false;
                }
                else
                        break;
@@ -461,6 +465,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
                processed_length += 2;
 
                region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8);
+//             eDebug("new region_buffer %p", &(*region->region_buffer));
 
                int region_level_of_compatibility, region_depth;
 
@@ -487,6 +492,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 
                if (region_fill_flag)
                {
+//                     eDebug("region fill region_buffer %p", &(*region->region_buffer));
                        if (region_depth == 1)
                                memset(region->region_buffer->surface->data, region_2bit_pixel_code, region->region_height * region->region_width);
                        else if (region_depth == 2)
@@ -727,7 +733,7 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 void eDVBSubtitleParser::subtitle_process_pes(__u8 *pkt, int len)
 {
 //     eDebug("subtitle_process_pes");
-       if (!extract_pts(show_time, pkt))
+       if (!extract_pts(m_show_time, pkt))
        {
                pkt += 6; len -= 6;
                // skip PES header
@@ -770,14 +776,14 @@ void eDVBSubtitleParser::subtitle_process_pes(__u8 *pkt, int len)
 void eDVBSubtitleParser::subtitle_redraw_all()
 {
 #if 1
-       subtitle_page *page = this->pages;
+       subtitle_page *page = m_pages;
        while(page)
        {
                subtitle_redraw(page->page_id);
                page = page->next;
        }
 #else
-       subtitle_page *page = this->pages;
+       subtitle_page *page = m_pages;
        //eDebug("----------- end of display set");
        //eDebug("active pages:");
        while (page)
@@ -819,7 +825,7 @@ void eDVBSubtitleParser::subtitle_redraw_all()
 
 void eDVBSubtitleParser::subtitle_reset()
 {
-       while (subtitle_page *page = this->pages)
+       while (subtitle_page *page = m_pages)
        {
                        /* free page regions */
                while (page->page_regions)
@@ -842,8 +848,7 @@ void eDVBSubtitleParser::subtitle_reset()
 
                        if (region->region_buffer)
                        {
-                               if (region->region_buffer->surface)
-                                       delete region->region_buffer->surface;
+//                             eDebug("no more need of region_buffer 2 %p", &(*region->region_buffer));
                                region->region_buffer=0;
                        }
 
@@ -859,16 +864,16 @@ void eDVBSubtitleParser::subtitle_reset()
                        delete clut;
                }
 
-               this->pages = page->next;
+               m_pages = page->next;
                delete page;
        }
 }
 
 void eDVBSubtitleParser::subtitle_redraw(int page_id)
 {
-       subtitle_page *page = this->pages;
+       subtitle_page *page = m_pages;
 
-       //eDebug("displaying page id %d", page_id);
+//     eDebug("displaying page id %d", page_id);
 
        while (page)
        {
@@ -887,7 +892,7 @@ void eDVBSubtitleParser::subtitle_redraw(int page_id)
        subtitle_page_region *region = page->page_regions;
 
        eDVBSubtitlePage Page;
-       Page.m_show_time = show_time;
+       Page.m_show_time = m_show_time;
        for (; region; region=region->next)
        {
 //             eDebug("region %d", region->region_id);
@@ -901,12 +906,12 @@ void eDVBSubtitleParser::subtitle_redraw(int page_id)
                }
                if (reg)
                {
+                       if (reg->committed)
+                               continue;
 //                     eDebug("copy region %d to %d, %d", region->region_id, region->region_horizontal_address, region->region_vertical_address);
 
                        int x0 = region->region_horizontal_address;
                        int y0 = region->region_vertical_address;
-                       int x1 = x0 + reg->region_width;
-                       int y1 = y0 + reg->region_height;
 
                        if ((x0 < 0) || (y0 < 0))
                        {
@@ -928,15 +933,8 @@ void eDVBSubtitleParser::subtitle_redraw(int page_id)
                        int clut_size = reg->region_buffer->surface->clut.colors = reg->region_depth == subtitle_region::bpp2 ?
                                4 : reg->region_depth == subtitle_region::bpp4 ? 16 : 256;
 
-                       if (reg->region_buffer->surface->clut.data &&
-                               clut_size != reg->region_buffer->surface->clut.colors)
-                       {
-                               delete [] reg->region_buffer->surface->clut.data;
-                               reg->region_buffer->surface->clut.data = 0;
-                       }
-
-                       if (!reg->region_buffer->surface->clut.data)
-                               reg->region_buffer->surface->clut.data = new gRGB[clut_size];
+                       reg->region_buffer->surface->clut.data = new gRGB[clut_size];
+//                     eDebug("create clut data for region_buffer %p", &(*reg->region_buffer));
 
                        gRGB *palette = reg->region_buffer->surface->clut.data;
 
@@ -1077,12 +1075,14 @@ void eDVBSubtitleParser::subtitle_redraw(int page_id)
                                        }
                                }
                        }
-                       
+
+//                     eDebug("commit region_buffer %p", &(*reg->region_buffer));
                        eDVBSubtitleRegion Region;
                        Region.m_pixmap = reg->region_buffer;
                        Region.m_position.setX(x0);
                        Region.m_position.setY(y0);
                        Page.m_regions.push_back(Region);
+                       reg->committed = true;
                }
                else
                        eDebug("region not found");
@@ -1098,7 +1098,7 @@ void eDVBSubtitleParser::subtitle_redraw(int page_id)
 DEFINE_REF(eDVBSubtitleParser);
 
 eDVBSubtitleParser::eDVBSubtitleParser(iDVBDemux *demux)
-       :pages(0)
+       :m_pages(0)
 {
        setStreamID(0xBD);
 
@@ -1123,11 +1123,14 @@ int eDVBSubtitleParser::stop()
        return -1;
 }
 
-int eDVBSubtitleParser::start(int pid)
+int eDVBSubtitleParser::start(int pid, int composition_page_id, int ancillary_page_id)
 {
        if (m_pes_reader)
        {
-               eDebug("start dvb subtitles on pid 0x%04x", pid);
+               eDebug("start dvb subtitles on pid 0x%04x with composition_page_id %d and ancillary_page_id %d",
+                       pid, composition_page_id, ancillary_page_id);
+               m_composition_page_id = composition_page_id;
+               m_ancillary_page_id = ancillary_page_id;
                return m_pes_reader->start(pid);
        }
        return -1;