non critical fixes (better memory handling)

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 49b804b69d74e3e609254a99787209dc9a88871a..46311f60fc14569219e8285df9a8ec6117cccabf 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -516,10 +516,11 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                                        if ( tm_it_tmp->first == TM ) // just update eventdata
                                        {
                                                // exempt memory
                                        if ( tm_it_tmp->first == TM ) // just update eventdata
                                        {
                                                // exempt memory

-                                               delete ev_it->second;
+                                               eventData *tmp = ev_it->second;

                                                ev_it->second = tm_it_tmp->second =
                                                        new eventData(eit_event, eit_event_size, source);
                                                FixOverlapping(servicemap, TM, duration, tm_it_tmp, service);
                                                ev_it->second = tm_it_tmp->second =
                                                        new eventData(eit_event, eit_event_size, source);
                                                FixOverlapping(servicemap, TM, duration, tm_it_tmp, service);

+                                               delete tmp;

                                                goto next;
                                        }
                                        else  // event has new event begin time
                                                goto next;
                                        }
                                        else  // event has new event begin time


@@ -562,25 +563,29 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 #endif
                        if (ev_erase_count > 0 && tm_erase_count > 0) // 2 different pairs have been removed
                        {
 #endif
                        if (ev_erase_count > 0 && tm_erase_count > 0) // 2 different pairs have been removed
                        {

-                               // exempt memory
-                               delete ev_it->second;
-                               delete tm_it->second;
+                               eventData *tmp1 = ev_it->second,
+                                               *tmp2 = tm_it->second;

                                ev_it->second=evt;
                                tm_it->second=evt;
                                ev_it->second=evt;
                                tm_it->second=evt;

+                               // exempt memory
+                               delete tmp1;
+                               delete tmp2;

                        }
                        else if (ev_erase_count == 0 && tm_erase_count > 0)
                        {
                        }
                        else if (ev_erase_count == 0 && tm_erase_count > 0)
                        {

-                               // exempt memory
-                               delete ev_it->second;
+                               eventData *tmp = ev_it->second;

                                tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
                                ev_it->second=evt;
                                tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
                                ev_it->second=evt;

+                               // exempt memory
+                               delete tmp;

                        }
                        else if (ev_erase_count > 0 && tm_erase_count == 0)
                        {
                        }
                        else if (ev_erase_count > 0 && tm_erase_count == 0)
                        {

-                               // exempt memory
-                               delete tm_it->second;
+                               eventData *tmp = tm_it->second;

                                ev_it=prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
                                tm_it->second=evt;
                                ev_it=prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
                                tm_it->second=evt;

+                               // exempt memory
+                               delete tmp;

                        }
                        else // added new eventData
                        {
                        }
                        else // added new eventData
                        {

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 162749657a16804e7e34a0075a50505fca4f8e5a..e5dd148be2b6ea3d57962d5995e8dd548b4b16b4 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -218,10 +218,6 @@ public:
                        flush,
                        startChannel,
                        leaveChannel,
                        flush,
                        startChannel,
                        leaveChannel,

-                       pause,
-                       restart,
-                       updated,
-                       isavail,

                        quit,
                        got_private_pid,
                        timeChanged
                        quit,
                        got_private_pid,
                        timeChanged