Remove null pointer checks when the pointer had already been used. Th… (

#7852)

* Remove null pointer checks when the pointer had already been used. The code would have caused a crash before the null pointer test if it'd ever occur, so presumably it doesn't.

* Correct a static analyzer result

* more storage checks downstream

---------

Co-authored-by: David Lowndes <David@DAVIDPCZ>
Co-authored-by: Paul Walker <paul@pwjw.com>

src/common/PatchDB.cpp

@@ -803,7 +803,10 @@ CREATE TABLE IF NOT EXISTS Favorites (
         }
         catch (const SQL::Exception &e)
         {
-            storage->reportError(e.what(), "PatchDB - Load Check");
+            if (storage)
+            {
+                storage->reportError(e.what(), "PatchDB - Load Check");
+            }
             return;
         }
 
@@ -832,7 +835,10 @@ CREATE TABLE IF NOT EXISTS Favorites (
         }
         catch (const SQL::Exception &e)
         {
-            storage->reportError(e.what(), "PatchDB - Insert Patch");
+            if (storage)
+            {
+                storage->reportError(e.what(), "PatchDB - Insert Patch");
+            }
             return;
         }
 
@@ -934,7 +940,10 @@ CREATE TABLE IF NOT EXISTS Favorites (
         }
         catch (const SQL::Exception &e)
         {
-            storage->reportError(e.what(), "PatchDB - FXP Features");
+            if (storage)
+            {
+                storage->reportError(e.what(), "PatchDB - FXP Features");
+            }
             return;
         }
 
@@ -950,7 +959,10 @@ CREATE TABLE IF NOT EXISTS Favorites (
         }
         catch (const SQL::Exception &e)
         {
-            storage->reportError(e.what(), "PatchDB - FXP Features");
+            if (storage)
+            {
+                storage->reportError(e.what(), "PatchDB - FXP Features");
+            }
             return;
         }
     }

src/common/SurgeStorage.cpp

@@ -1332,11 +1332,6 @@ void SurgeStorage::load_wt(int id, Wavetable *wt, OscillatorStorage *osc)
         return;
     }
 
-    if (!wt)
-    {
-        return;
-    }
-
     load_wt(path_to_string(wt_list[id].path), wt, osc);
 
     if (osc)

src/surge-xt/gui/overlays/LuaEditors.cpp

@@ -292,7 +292,7 @@ struct ExpandingFormulaDebugger : public juce::Component, public Surge::GUI::Ski
 
         stepLfoDebugger();
 
-        if (editor && editor->editor)
+        if (editor->editor)
             editor->editor->enqueueAccessibleAnnouncement("Reset Debugger");
     }
 
@@ -339,7 +339,7 @@ struct ExpandingFormulaDebugger : public juce::Component, public Surge::GUI::Ski
             debugTable->repaint();
         }
 
-        if (editor && editor->editor)
+        if (editor->editor)
             editor->editor->enqueueAccessibleAnnouncement("Stepped Debugger");
     }
 

src/surge-xt/gui/overlays/MSEGEditor.cpp

@@ -2943,14 +2943,11 @@ void MSEGControlRegion::valueChanged(Surge::GUI::IComponentTagValue *p)
         Surge::MSEG::modifyEditMode(this->ms, editMode);
 
         // zoom to fit
-        if (canvas)
-        {
-            canvas->ms->axisStart = 0.f;
-            canvas->ms->axisWidth = editMode ? 1.f : ms->envelopeModeDuration;
+        canvas->ms->axisStart = 0.f;
+        canvas->ms->axisWidth = editMode ? 1.f : ms->envelopeModeDuration;
 
-            canvas->modelChanged(0, false);
-            canvas->repaint();
-        }
+        canvas->modelChanged(0, false);
+        canvas->repaint();
 
         repaint();
         break;
@@ -2961,11 +2958,8 @@ void MSEGControlRegion::valueChanged(Surge::GUI::IComponentTagValue *p)
         canvas->pushToUndo();
         int m = floor((val * 2) + 0.1) + 1;
         ms->loopMode = (MSEGStorage::LoopMode)m;
-        if (canvas)
-        {
-            canvas->modelChanged();
-            canvas->repaint();
-        }
+        canvas->modelChanged();
+        canvas->repaint();
         repaint();
         break;
     }