Fix memory leak in GetUpcoming API.

Robert McNamara · Robert McNamara · commit 12aa9525ed0f · 2011-10-30T12:28:14.000-07:00
Switch the temp recording list back to autodelete, and just push back new recordingInfo objects into the final list (which is also autodelete).
diff --git a/mythtv/programs/mythbackend/services/dvr.cpp b/mythtv/programs/mythbackend/services/dvr.cpp
@@ -211,7 +211,7 @@ DTC::ProgramList* Dvr::GetUpcoming( int  nStartIndex,
                                     bool bShowAll )
 {
     RecordingList  recordingList;
-    RecordingList  tmpList(false);
+    RecordingList  tmpList;
     bool hasConflicts;
     LoadFromScheduler(tmpList, hasConflicts);
 
@@ -223,12 +223,12 @@ DTC::ProgramList* Dvr::GetUpcoming( int  nStartIndex,
             ((*it)->GetRecordingStartTime() >=
              QDateTime::currentDateTime()))
         {
-            recordingList.push_back(*it);
+            recordingList.push_back(new RecordingInfo(**it));
         }
         else if (bShowAll && ((*it)->GetRecordingStartTime() >=
              QDateTime::currentDateTime()))
         {
-            recordingList.push_back(*it);
+            recordingList.push_back(new RecordingInfo(**it));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ DTC::ProgramList* Dvr::GetUpcoming( int nStartIndex,`
`211`	`211`	`bool bShowAll )`
`212`	`212`	`{`
`213`	`213`	`RecordingList recordingList;`
`214`		`- RecordingList tmpList(false);`
	`214`	`+ RecordingList tmpList;`
`215`	`215`	`bool hasConflicts;`
`216`	`216`	`LoadFromScheduler(tmpList, hasConflicts);`
`217`	`217`
`@@ -223,12 +223,12 @@ DTC::ProgramList* Dvr::GetUpcoming( int nStartIndex,`
`223`	`223`	`((*it)->GetRecordingStartTime() >=`
`224`	`224`	`QDateTime::currentDateTime()))`
`225`	`225`	`{`
`226`		`- recordingList.push_back(*it);`
	`226`	`+ recordingList.push_back(new RecordingInfo(**it));`
`227`	`227`	`}`
`228`	`228`	`else if (bShowAll && ((*it)->GetRecordingStartTime() >=`
`229`	`229`	`QDateTime::currentDateTime()))`
`230`	`230`	`{`
`231`		`- recordingList.push_back(*it);`
	`231`	`+ recordingList.push_back(new RecordingInfo(**it));`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`