tidy: Fix a couple of nullptr dereferences.

The clang-tidy "non null parameter" checker pointed out a couple of places where null pointers were passed to functions that then dereference them. Fix these by adding tests for nullptr within the function. https://clang.llvm.org/extra/clang-tidy/checks/clang-analyzer-core.NonNullParamChecker.html
MythTV · Dec 3, 2019 · ab315e5 · ab315e5
1 parent 4b82e6b
commit ab315e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/mythplugins/mythweather/mythweather/weatherSource.cpp b/mythplugins/mythweather/mythweather/weatherSource.cpp
@@ -316,9 +316,11 @@ ScriptInfo *WeatherSource::ProbeScript(const QFileInfo &fi)
     return new ScriptInfo(info);
 }
 
-/*
+/**
  * Watch out, we store the parameter as a member variable, don't go deleting it,
  * that wouldn't be good.
+ *
+ * \param info is a required variable.
  */
 WeatherSource::WeatherSource(ScriptInfo *info)
     : m_ready(info != nullptr),
@@ -330,9 +332,11 @@ WeatherSource::WeatherSource(ScriptInfo *info)
     if (!dir.exists("MythWeather"))
         dir.mkdir("MythWeather");
     dir.cd("MythWeather");
-    if (!dir.exists(info->name))
-        dir.mkdir(info->name);
-    dir.cd(info->name);
+    if (info != nullptr) {
+        if (!dir.exists(info->name))
+            dir.mkdir(info->name);
+        dir.cd(info->name);
+    }
     m_dir = dir.absolutePath();
 
     connect( m_updateTimer, SIGNAL(timeout()), this, SLOT(updateTimeout()));

diff --git a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp
@@ -1556,7 +1556,8 @@ void NuppelVideoRecorder::DoV4L2(void)
 
         if (!m_request_pause)
         {
-            if (m_v4l2_pixelformat == V4L2_PIX_FMT_YUYV)
+            if ((m_v4l2_pixelformat == V4L2_PIX_FMT_YUYV) &&
+                     (output_buffer != nullptr))
             {
                 AVFrame img_in;
                 av_image_fill_arrays(img_in.data, img_in.linesize,
@@ -1566,7 +1567,8 @@ void NuppelVideoRecorder::DoV4L2(void)
                           0, m_height, img_out.data, img_out.linesize);
                 BufferIt(output_buffer, m_video_buffer_size);
             }
-            else if (m_v4l2_pixelformat == V4L2_PIX_FMT_UYVY)
+            else if ((m_v4l2_pixelformat == V4L2_PIX_FMT_UYVY) &&
+                     (output_buffer != nullptr))
             {
                 AVFrame img_in;
                 av_image_fill_arrays(img_in.data, img_in.linesize,

diff --git a/mythtv/programs/mythfrontend/progdetails.cpp b/mythtv/programs/mythfrontend/progdetails.cpp
@@ -827,7 +827,7 @@ void ProgDetails::loadPage(void)
     }
     else if (m_progInfo.GetRecordingRuleID())
     {
-        recordingProfile =  record->m_recProfile;
+        recordingProfile = record ? record->m_recProfile : tr("Unknown");
     }
     addItem(tr("Recording Host"), recordingHost, ProgInfoList::kLevel2);
     addItem(tr("Recording Input"), recordingInput, ProgInfoList::kLevel2);