From c158a63a8af668eac20ed303b1f8c02b6831a983 Mon Sep 17 00:00:00 2001 From: lucicam Date: Fri, 2 Apr 2021 16:16:40 +0300 Subject: Fix crash caused by null parameter passed to CameraServer.add_feed() Fixes #46181 CameraServer.add_feed() takes a CameraFeed object type as parameter. Passing in another type of data while binding the method it will make tha parameter null. Added a check for null which returns from function and does not make the engine crash anymore. --- servers/camera_server.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'servers') diff --git a/servers/camera_server.cpp b/servers/camera_server.cpp index b06f32417c..ee4a2e148b 100644 --- a/servers/camera_server.cpp +++ b/servers/camera_server.cpp @@ -99,6 +99,8 @@ Ref CameraServer::get_feed_by_id(int p_id) { }; void CameraServer::add_feed(const Ref &p_feed) { + ERR_FAIL_COND(p_feed.is_null()); + // add our feed feeds.push_back(p_feed); -- cgit v1.2.3