Skip to content

Commit c6c50df

Browse files
committed
Refs #9306. Fixes a memory leak in the EIT scanner.
1 parent 415b883 commit c6c50df

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

mythtv/libs/libmythtv/eithelper.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,13 @@ static inline void parse_dvb_component_descriptors(desc_list_t list,
304304
void EITHelper::AddEIT(const DVBEventInformationTable *eit)
305305
{
306306
uint descCompression = (eit->TableID() > 0x80) ? 2 : 1;
307-
uint fix = fixup[eit->OriginalNetworkID() << 16];
308-
fix |= fixup[(((uint64_t)eit->TSID()) << 32) |
309-
(eit->OriginalNetworkID() << 16)];
310-
fix |= fixup[(eit->OriginalNetworkID() << 16) | eit->ServiceID()];
311-
fix |= fixup[(((uint64_t)eit->TSID()) << 32) |
307+
uint fix = fixup.value(eit->OriginalNetworkID() << 16);
308+
fix |= fixup.value((((uint64_t)eit->TSID()) << 32) |
309+
(eit->OriginalNetworkID() << 16));
310+
fix |= fixup.value((eit->OriginalNetworkID() << 16) | eit->ServiceID());
311+
fix |= fixup.value((((uint64_t)eit->TSID()) << 32) |
312312
(uint64_t)(eit->OriginalNetworkID() << 16) |
313-
(uint64_t)eit->ServiceID()];
313+
(uint64_t)eit->ServiceID());
314314
fix |= EITFixUp::kFixGenericDVB;
315315

316316
uint chanid = GetChanID(eit->ServiceID(), eit->OriginalNetworkID(),
@@ -493,7 +493,7 @@ void EITHelper::AddEIT(const DVBEventInformationTable *eit)
493493
void EITHelper::AddEIT(const PremiereContentInformationTable *cit)
494494
{
495495
// set fixup for Premiere
496-
uint fix = fixup[133 << 16];
496+
uint fix = fixup.value(133 << 16);
497497
fix |= EITFixUp::kFixGenericDVB;
498498

499499
QString title = QString("");
@@ -656,7 +656,7 @@ void EITHelper::CompleteEvent(uint atsc_major, uint atsc_minor,
656656
subtitle.detach();
657657
db_events.enqueue(new DBEventEIT(chanid, title, subtitle,
658658
starttime, endtime,
659-
fixup[atsc_key], subtitle_type,
659+
fixup.value(atsc_key), subtitle_type,
660660
audio_properties, video_properties));
661661
}
662662

0 commit comments

Comments
 (0)