Ticket #5136: libs_libmythtv_mpeg_mpegstreamdata.cpp-avoid-use-after-free.patch

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -1388 +1388 @@
         return;
 
     uint tid = psip->TableIDExtension();
+    bool delete_psip = false;
 
     QMutexLocker locker(&_cache_lock);
     if (_cached_ref_cnt[psip] > 0)
@@ -1399 +1400 @@
              (_cached_pats[(tid << 8) | psip->Section()] == psip))
     {
         _cached_pats[(tid << 8) | psip->Section()] = NULL;
-        delete psip;
+        delete_psip = true;
     }
     else if ((TableID::PMT == psip->TableID()) &&
              (_cached_pmts[(tid << 8) | psip->Section()] == psip))
     {
         _cached_pmts[(tid << 8) | psip->Section()] = NULL;
-        delete psip;
+        delete_psip = true;
     }
     else
     {
@@ -1416 +1417 @@
     it = _cached_slated_for_deletion.find(psip);
     if (it != _cached_slated_for_deletion.end())
         _cached_slated_for_deletion.erase(it);
+
+    if (delete_psip)
+    {
+        delete(psip);
+        psip = NULL;
+    }
 }
 
 void MPEGStreamData::CachePAT(const ProgramAssociationTable *_pat)