Ticket #5564: pginfo-crashes.patch

mythtv/programs/mythbackend/mainserver.cpp

@@ -3436 +3436 @@
     ProgramInfo *pginfo = ProgramInfo::GetProgramFromRecorded(chanid,
                                                               startdt);
 
-    if (commbreak)
-        pginfo->GetCommBreakList(markMap);
-    else
-        pginfo->GetCutList(markMap);
+    if (pginfo) {
+        if (commbreak)
+            pginfo->GetCommBreakList(markMap);
+        else
+            pginfo->GetCutList(markMap);
 
-    for (it = markMap.begin(); it != markMap.end(); ++it)
-    {
-        rowcnt++;
-        QString intstr = QString("%1").arg(it.data());
-        retlist << intstr;
-        encodeLongLong(retlist,it.key());
+        for (it = markMap.begin(); it != markMap.end(); ++it)
+        {
+            rowcnt++;
+            QString intstr = QString("%1").arg(it.data());
+            retlist << intstr;
+            encodeLongLong(retlist,it.key());
+        }
     }
 
     if (rowcnt > 0)
@@ -3508 +3510 @@
     QDateTime startdt;
     startdt.setTime_t((uint)atoi(starttime));
     QStringList retlist;
-    long long bookmark;
+    long long bookmark = -1;
 
     ProgramInfo *pginfo = ProgramInfo::GetProgramFromRecorded(chanid,
                                                               startdt);
-    bookmark = pginfo->GetBookmark();
+    if (pginfo) bookmark = pginfo->GetBookmark();
 
     encodeLongLong(retlist,bookmark);
 
@@ -3550 +3552 @@
 
     ProgramInfo *pginfo = ProgramInfo::GetProgramFromRecorded(chanid,
                                                               startdt);
-    pginfo->SetBookmark(bookmark);
+    if (pginfo) {
+        pginfo->SetBookmark(bookmark);
+        retlist << "OK";
+    }
+    else
+        retlist << "FAILED";
 
-    retlist << "OK";
     if (pbssock)
         SendResponse(pbssock, retlist);