From 9f7cb75fd428abffcc535865abe769f10cf66732 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 24 May 2012 20:49:55 +0100 Subject: [PATCH] Always check the return value of QSqlQuery::next() and QSqlQuery::exec() before accessing results in Scheduler::UpdateManuals() and UPnpCDSTv::AddItem(). Coverity defects 700275 and 700276. --- mythtv/programs/mythbackend/scheduler.cpp | 4 +++- mythtv/programs/mythbackend/upnpcdstv.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp index 1831f05207d..0c39a3321b9 100644 --- a/mythtv/programs/mythbackend/scheduler.cpp +++ b/mythtv/programs/mythbackend/scheduler.cpp @@ -3197,7 +3197,9 @@ void Scheduler::UpdateManuals(uint recordid) return; } - query.next(); + if (!query.next()) + return; + RecordingType rectype = RecordingType(query.value(0).toInt()); QString title = query.value(1).toString(); QString station = query.value(2).toString() ; diff --git a/mythtv/programs/mythbackend/upnpcdstv.cpp b/mythtv/programs/mythbackend/upnpcdstv.cpp index f3c290df009..6629bd38542 100644 --- a/mythtv/programs/mythbackend/upnpcdstv.cpp +++ b/mythtv/programs/mythbackend/upnpcdstv.cpp @@ -423,8 +423,7 @@ void UPnpCDSTv::AddItem( const UPnpCDSRequest *pRequest, "starttime=:STARTTIME AND type = 33" ); query2.bindValue(":CHANID", (int)nChanid); query2.bindValue(":STARTTIME", dtProgStart.toString("yyyy/MM/dd hh:mm:ss")); - query2.exec(); - if (query2.next()) + if (query2.exec() && query2.next()) uiDur = query2.value(0).toUInt() / 1000; QString sDur;