From e13770434e5cfe8dd0d75720352a8fd4d87f46e5 Mon Sep 17 00:00:00 2001 From: Stuart Auchterlonie Date: Wed, 5 Jan 2011 14:29:11 +0000 Subject: [PATCH] Refs #9306. Fixes a memory leak in the EIT scanner. --- mythtv/libs/libmythtv/eithelper.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp index aa715c50ea8..b3a9974e145 100644 --- a/mythtv/libs/libmythtv/eithelper.cpp +++ b/mythtv/libs/libmythtv/eithelper.cpp @@ -304,13 +304,13 @@ static inline void parse_dvb_component_descriptors(desc_list_t list, void EITHelper::AddEIT(const DVBEventInformationTable *eit) { uint descCompression = (eit->TableID() > 0x80) ? 2 : 1; - uint fix = fixup[eit->OriginalNetworkID() << 16]; - fix |= fixup[(((uint64_t)eit->TSID()) << 32) | - (eit->OriginalNetworkID() << 16)]; - fix |= fixup[(eit->OriginalNetworkID() << 16) | eit->ServiceID()]; - fix |= fixup[(((uint64_t)eit->TSID()) << 32) | + uint fix = fixup.value(eit->OriginalNetworkID() << 16); + fix |= fixup.value((((uint64_t)eit->TSID()) << 32) | + (eit->OriginalNetworkID() << 16)); + fix |= fixup.value((eit->OriginalNetworkID() << 16) | eit->ServiceID()); + fix |= fixup.value((((uint64_t)eit->TSID()) << 32) | (uint64_t)(eit->OriginalNetworkID() << 16) | - (uint64_t)eit->ServiceID()]; + (uint64_t)eit->ServiceID()); fix |= EITFixUp::kFixGenericDVB; uint chanid = GetChanID(eit->ServiceID(), eit->OriginalNetworkID(), @@ -493,7 +493,7 @@ void EITHelper::AddEIT(const DVBEventInformationTable *eit) void EITHelper::AddEIT(const PremiereContentInformationTable *cit) { // set fixup for Premiere - uint fix = fixup[133 << 16]; + uint fix = fixup.value(133 << 16); fix |= EITFixUp::kFixGenericDVB; QString title = QString(""); @@ -656,7 +656,7 @@ void EITHelper::CompleteEvent(uint atsc_major, uint atsc_minor, subtitle.detach(); db_events.enqueue(new DBEventEIT(chanid, title, subtitle, starttime, endtime, - fixup[atsc_key], subtitle_type, + fixup.value(atsc_key), subtitle_type, audio_properties, video_properties)); }