Merge pull request #47571 from lucicam/master

Fix crash caused by null parameter passed to CameraServer.add_feed()
godotengine · Apr 3, 2021 · 4a65e69 · 4a65e69
2 parents 8f7f584 + c158a63
commit 4a65e69
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/servers/camera_server.cpp b/servers/camera_server.cpp
@@ -99,6 +99,8 @@ Ref<CameraFeed> CameraServer::get_feed_by_id(int p_id) {
 };
 
 void CameraServer::add_feed(const Ref<CameraFeed> &p_feed) {
+	ERR_FAIL_COND(p_feed.is_null());
+
 	// add our feed
 	feeds.push_back(p_feed);