Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git log -p --no-color 7ff031a^..c331c3f
- commit c331c3fb3b453a1d4cfe4d27fdc14dc257f2d0e3
- Author: Paul Harrison <pharrison@mythtv.org>
- Date: Thu Jul 9 11:01:05 2015 +0100
- bdiowrapper: make sure a string is null terminated
- Fixes CoverityID 1311259 Buffer not null terminated
- diff --git a/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp b/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp
- index 0aa9740..126b3f8 100644
- --- a/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp
- +++ b/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp
- @@ -37,7 +37,8 @@ static int dir_read_mythiowrapper(BD_DIR_H *dir, BD_DIRENT *entry)
- char *filename = mythdir_readdir((int)(intptr_t)dir->internal);
- if (filename)
- {
- - strncpy(entry->d_name, filename, 256);
- + entry->d_name[255] = '\0';
- + strncpy(entry->d_name, filename, 255);
- free(filename);
- return 0;
- }
- commit 30faed2e84675e151b786578bd30a5f37fd83e44
- Author: Paul Harrison <pharrison@mythtv.org>
- Date: Thu Jul 9 10:46:50 2015 +0100
- FunctionDialog: initialise a class member in the ctor
- Fixes CoverityID 1266412 Uninitialized pointer field
- diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
- index 3b7a176..7139acb 100644
- --- a/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
- +++ b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
- @@ -36,7 +36,7 @@ const int TIME_UPDATE_TIME = 1000 * 1; // update the time every 1 second
- FunctionDialog::FunctionDialog(MythScreenStack *parent, Monitor *monitor) :
- MythScreenType(parent, "functionpopup"), m_monitor(monitor),
- m_captionText(NULL), m_functionList(NULL),
- - m_enabledCheck(NULL), m_okButton(NULL)
- + m_enabledCheck(NULL), m_notificationCheck(NULL), m_okButton(NULL)
- {
- }
- commit 238d899576c1479e54de5a833994e02798a01608
- Author: Paul Harrison <pharrison@mythtv.org>
- Date: Thu Jul 9 10:40:29 2015 +0100
- mythzoneminder: ignore the return value from checkConnection()
- In this case we don't care if it fails we will retry later anyway.
- Fixes CoverityID 1266288 Unchecked return value
- diff --git a/mythplugins/mythzoneminder/mythzoneminder/main.cpp b/mythplugins/mythzoneminder/mythzoneminder/main.cpp
- index 73b16ba..a6957d5 100644
- --- a/mythplugins/mythzoneminder/mythzoneminder/main.cpp
- +++ b/mythplugins/mythzoneminder/mythzoneminder/main.cpp
- @@ -195,7 +195,7 @@ int mythplugin_init(const char *libversion)
- return -1;
- // setup a connection to the mythzmserver
- - checkConnection();
- + (void) checkConnection();
- setupKeys();
- commit 3f7258b483fbaece07582a96b08e89978766504d
- Author: Paul Harrison <pharrison@mythtv.org>
- Date: Thu Jul 9 10:21:14 2015 +0100
- mytharchivehelper: check the return value from MSqlQuery::exec()
- Fixes CoverityID 1266286 Unchecked return value
- diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp
- index a441bee..3098f96 100644
- --- a/mythplugins/mytharchive/mytharchivehelper/main.cpp
- +++ b/mythplugins/mytharchive/mytharchivehelper/main.cpp
- @@ -1068,9 +1068,11 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
- // delete any records for this recordings
- query.prepare("DELETE FROM recordedmarkup "
- "WHERE chanid = :CHANID AND starttime = :STARTTIME;");
- - query.bindValue(":CHANID", chanID);
- - query.bindValue(":STARTTIME", startTime);
- - query.exec();
- + query.bindValue(":CHANID", chanID);
- + query.bindValue(":STARTTIME", startTime);
- +
- + if (!query.exec())
- + MythDB::DBError("recordedmarkup delete", query);
- // add any new records for this recording
- for (int x = 0; x < nodeList.count(); x++)
- commit 7ff031ad662d51a55c332c7730293c8066de5c01
- Author: Paul Harrison <pharrison@mythtv.org>
- Date: Wed Jul 8 22:59:04 2015 +0100
- MarkedFiles: initialise a class member in the ctor
- Fixes CoverityID 1311270 Uninitialized scalar field
- diff --git a/mythtv/programs/mythfrontend/galleryviews.h b/mythtv/programs/mythfrontend/galleryviews.h
- index e1dca0b..e8d9eef 100644
- --- a/mythtv/programs/mythfrontend/galleryviews.h
- +++ b/mythtv/programs/mythfrontend/galleryviews.h
- @@ -78,6 +78,7 @@ public:
- class MarkedFiles
- {
- public:
- + MarkedFiles(void): parent(-1) {}
- void Reset(int id = -1) { ids.clear(); parent = id; }
- void Add(int id) { ids.insert(id); }
- void Add(ImageIdList newIds) { ids += newIds.toSet(); }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement