Add protection for nulltpr crash

Signed-off-by: Ryan Friedman <[email protected]>
ArduPilot · Jan 22, 2024 · 5a8edcc · 5a8edcc
1 parent 1caa507
commit 5a8edcc
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/CameraZoomPlugin.cc b/src/CameraZoomPlugin.cc
@@ -165,13 +165,19 @@ void CameraZoomPlugin::Impl::OnZoom(const msgs::Double &_msg)
 void CameraZoomPlugin::Impl::InitialiseCamera()
 {
   // Wait for render engine to be available.
-  if (rendering::loadedEngines().empty())
+  if (rendering::loadedEngines().empty()) {
     return;
+  }
 
   // Get scene.
   if (!this->scene)
   {
     this->scene = rendering::sceneFromFirstRenderEngine();
+    if (!this->scene) {
+      gzerr << "Failed to get scene in InitialiseCamera()!\n";
+      return;
+    }
+
   }
 
   // Return if scene not ready or no sensors available.