Ticket #5301: programs_mythbackend_playbacksock.cpp-check-return-values.patch

File programs_mythbackend_playbacksock.cpp-check-return-values.patch, 3.7 KB (added by Erik Hovland <erik@…>, 17 years ago)

  • programs/mythbackend/mainserver.cpp 

    FromStringList can return an error code, make sure it is checked and reported.

From: Erik Hovland <erik@hovland.org>


---

 programs/mythbackend/mainserver.cpp   |   16 ++++++++++++----
 programs/mythbackend/playbacksock.cpp |   11 +++++++----
 programs/mythbackend/playbacksock.h   |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/programs/mythbackend/mainserver.cpp b/programs/mythbackend/mainserver.cpp
index af91922..5e73693 100644
    a b void MainServer::HandleQueryRecordings(QString type, PlaybackSock *pbs)  
    13381338            {
    13391339                if (proginfo->filesize == 0)
    13401340                {
    1341                     slave->FillProgramInfo(proginfo, playbackhost);
    1342 
    1343                     if (proginfo->recendts < QDateTime::currentDateTime())
    1344                         proginfo->SetFilesize(proginfo->filesize);
     1341                    if (!slave->FillProgramInfo(proginfo, playbackhost))
     1342                    {
     1343                        VERBOSE(VB_IMPORTANT,
     1344                                "MainServer::HandleQueryRecordings()"
     1345                                "\n\t\t\tCould not fill program info "
     1346                                "from backend");
     1347                    }
     1348                    else
     1349                    {
     1350                        if (proginfo->recendts < QDateTime::currentDateTime())
     1351                            proginfo->SetFilesize(proginfo->filesize);
     1352                    }
    13451353                }
    13461354                else
    13471355                {

  • programs/mythbackend/playbacksock.cpp 

    diff --git a/programs/mythbackend/playbacksock.cpp b/programs/mythbackend/playbacksock.cpp
index 941aa3c..b64a616 100644
    a b int PlaybackSock::DeleteRecording(const ProgramInfo *pginfo, bool forceMetadataD  
    142142    return strlist[0].toInt();
    143143}
    144144
    145 void PlaybackSock::FillProgramInfo(ProgramInfo *pginfo, QString &playbackhost)
     145bool PlaybackSock::FillProgramInfo(ProgramInfo *pginfo, QString &playbackhost)
    146146{
    147147    QStringList strlist( QString("FILL_PROGRAM_INFO") );
    148148    strlist << playbackhost;
    … … void PlaybackSock::FillProgramInfo(ProgramInfo *pginfo, QString &playbackhost)  
    150150
    151151    SendReceiveStringList(strlist);
    152152
    153     pginfo->FromStringList(strlist, 0);
     153    return pginfo->FromStringList(strlist, 0);
    154154}
    155155
    156156QStringList PlaybackSock::GenPreviewPixmap(const ProgramInfo *pginfo)
    … … bool PlaybackSock::IsBusy(  
    226226    if (busy_input)
    227227    {
    228228        it++;
    229         busy_input->FromStringList(it, strlist.end());
     229        if (!busy_input->FromStringList(it, strlist.end()))
     230            state = false;
    230231    }
    231232
    232233    return state;
    … … ProgramInfo *PlaybackSock::GetRecording(int capturecardnum)  
    274275    SendReceiveStringList(strlist);
    275276
    276277    ProgramInfo *info = new ProgramInfo();
    277     info->FromStringList(strlist, 0);
     278    if (!info->FromStringList(strlist, 0))
     279        return NULL;
     280
    278281    return info;
    279282}
    280283

  • programs/mythbackend/playbacksock.h 

    diff --git a/programs/mythbackend/playbacksock.h b/programs/mythbackend/playbacksock.h
index e395523..f3c7a83 100644
    a b class PlaybackSock  
    4646    int StopRecording(const ProgramInfo *pginfo);
    4747    int CheckRecordingActive(const ProgramInfo *pginfo);
    4848    int DeleteRecording(const ProgramInfo *pginfo, bool forceMetadataDelete = false);
    49     void FillProgramInfo(ProgramInfo *pginfo, QString &playbackhost);
     49    bool FillProgramInfo(ProgramInfo *pginfo, QString &playbackhost);
    5050    QStringList GenPreviewPixmap(const ProgramInfo *pginfo);
    5151    QStringList GenPreviewPixmap(const ProgramInfo *pginfo,
    5252                                 bool               time_fmt_sec,