Advertisement
Guest User

Untitled

a guest
Jul 10th, 2015
258
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.69 KB | None | 0 0
  1. $ git log -p --no-color 7ff031a^..c331c3f
  2. commit c331c3fb3b453a1d4cfe4d27fdc14dc257f2d0e3
  3. Author: Paul Harrison <pharrison@mythtv.org>
  4. Date: Thu Jul 9 11:01:05 2015 +0100
  5.  
  6. bdiowrapper: make sure a string is null terminated
  7.  
  8. Fixes CoverityID 1311259 Buffer not null terminated
  9.  
  10. diff --git a/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp b/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp
  11. index 0aa9740..126b3f8 100644
  12. --- a/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp
  13. +++ b/mythtv/libs/libmythtv/Bluray/bdiowrapper.cpp
  14. @@ -37,7 +37,8 @@ static int dir_read_mythiowrapper(BD_DIR_H *dir, BD_DIRENT *entry)
  15. char *filename = mythdir_readdir((int)(intptr_t)dir->internal);
  16. if (filename)
  17. {
  18. - strncpy(entry->d_name, filename, 256);
  19. + entry->d_name[255] = '\0';
  20. + strncpy(entry->d_name, filename, 255);
  21. free(filename);
  22. return 0;
  23. }
  24.  
  25. commit 30faed2e84675e151b786578bd30a5f37fd83e44
  26. Author: Paul Harrison <pharrison@mythtv.org>
  27. Date: Thu Jul 9 10:46:50 2015 +0100
  28.  
  29. FunctionDialog: initialise a class member in the ctor
  30.  
  31. Fixes CoverityID 1266412 Uninitialized pointer field
  32.  
  33. diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
  34. index 3b7a176..7139acb 100644
  35. --- a/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
  36. +++ b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
  37. @@ -36,7 +36,7 @@ const int TIME_UPDATE_TIME = 1000 * 1; // update the time every 1 second
  38. FunctionDialog::FunctionDialog(MythScreenStack *parent, Monitor *monitor) :
  39. MythScreenType(parent, "functionpopup"), m_monitor(monitor),
  40. m_captionText(NULL), m_functionList(NULL),
  41. - m_enabledCheck(NULL), m_okButton(NULL)
  42. + m_enabledCheck(NULL), m_notificationCheck(NULL), m_okButton(NULL)
  43. {
  44. }
  45.  
  46.  
  47. commit 238d899576c1479e54de5a833994e02798a01608
  48. Author: Paul Harrison <pharrison@mythtv.org>
  49. Date: Thu Jul 9 10:40:29 2015 +0100
  50.  
  51. mythzoneminder: ignore the return value from checkConnection()
  52.  
  53. In this case we don't care if it fails we will retry later anyway.
  54.  
  55. Fixes CoverityID 1266288 Unchecked return value
  56.  
  57. diff --git a/mythplugins/mythzoneminder/mythzoneminder/main.cpp b/mythplugins/mythzoneminder/mythzoneminder/main.cpp
  58. index 73b16ba..a6957d5 100644
  59. --- a/mythplugins/mythzoneminder/mythzoneminder/main.cpp
  60. +++ b/mythplugins/mythzoneminder/mythzoneminder/main.cpp
  61. @@ -195,7 +195,7 @@ int mythplugin_init(const char *libversion)
  62. return -1;
  63.  
  64. // setup a connection to the mythzmserver
  65. - checkConnection();
  66. + (void) checkConnection();
  67.  
  68. setupKeys();
  69.  
  70.  
  71. commit 3f7258b483fbaece07582a96b08e89978766504d
  72. Author: Paul Harrison <pharrison@mythtv.org>
  73. Date: Thu Jul 9 10:21:14 2015 +0100
  74.  
  75. mytharchivehelper: check the return value from MSqlQuery::exec()
  76.  
  77. Fixes CoverityID 1266286 Unchecked return value
  78.  
  79. diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp
  80. index a441bee..3098f96 100644
  81. --- a/mythplugins/mytharchive/mytharchivehelper/main.cpp
  82. +++ b/mythplugins/mytharchive/mytharchivehelper/main.cpp
  83. @@ -1068,9 +1068,11 @@ int NativeArchive::importRecording(const QDomElement &itemNode,
  84. // delete any records for this recordings
  85. query.prepare("DELETE FROM recordedmarkup "
  86. "WHERE chanid = :CHANID AND starttime = :STARTTIME;");
  87. - query.bindValue(":CHANID", chanID);
  88. - query.bindValue(":STARTTIME", startTime);
  89. - query.exec();
  90. + query.bindValue(":CHANID", chanID);
  91. + query.bindValue(":STARTTIME", startTime);
  92. +
  93. + if (!query.exec())
  94. + MythDB::DBError("recordedmarkup delete", query);
  95.  
  96. // add any new records for this recording
  97. for (int x = 0; x < nodeList.count(); x++)
  98.  
  99. commit 7ff031ad662d51a55c332c7730293c8066de5c01
  100. Author: Paul Harrison <pharrison@mythtv.org>
  101. Date: Wed Jul 8 22:59:04 2015 +0100
  102.  
  103. MarkedFiles: initialise a class member in the ctor
  104.  
  105. Fixes CoverityID 1311270 Uninitialized scalar field
  106.  
  107. diff --git a/mythtv/programs/mythfrontend/galleryviews.h b/mythtv/programs/mythfrontend/galleryviews.h
  108. index e1dca0b..e8d9eef 100644
  109. --- a/mythtv/programs/mythfrontend/galleryviews.h
  110. +++ b/mythtv/programs/mythfrontend/galleryviews.h
  111. @@ -78,6 +78,7 @@ public:
  112. class MarkedFiles
  113. {
  114. public:
  115. + MarkedFiles(void): parent(-1) {}
  116. void Reset(int id = -1) { ids.clear(); parent = id; }
  117. void Add(int id) { ids.insert(id); }
  118. void Add(ImageIdList newIds) { ids += newIds.toSet(); }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement