Merge pull request #111965 from Ivorforce/memnew-typed

Make `memnew(RefCounted)` return `Ref`, to improve ownership safety

Author: Repiteo

core/debugger/engine_debugger.cpp

@@ -138,8 +138,8 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, bo
 		CreatePeerFunc *create_fn = protocols.getptr(proto);
 		ERR_FAIL_NULL_MSG(create_fn, vformat("Invalid protocol: %s.", proto));
 
-		RemoteDebuggerPeer *peer = (*create_fn)(p_uri);
-		if (!peer) {
+		Ref<RemoteDebuggerPeer> peer = (*create_fn)(p_uri);
+		if (peer.is_null()) {
 			return;
 		}
 		singleton = memnew(RemoteDebugger(Ref<RemoteDebuggerPeer>(peer)));

core/debugger/engine_debugger.h

@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/ref_counted.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
@@ -47,7 +48,7 @@ class EngineDebugger {
 
 	typedef Error (*CaptureFunc)(void *p_user, const String &p_msg, const Array &p_args, bool &r_captured);
 
-	typedef RemoteDebuggerPeer *(*CreatePeerFunc)(const String &p_uri);
+	typedef Ref<RemoteDebuggerPeer> (*CreatePeerFunc)(const String &p_uri);
 
 	class Profiler {
 		friend class EngineDebugger;

core/debugger/remote_debugger_peer.cpp

@@ -211,7 +211,7 @@ void RemoteDebuggerPeerTCP::_poll() {
 	}
 }
 
-RemoteDebuggerPeer *RemoteDebuggerPeerTCP::create_tcp(const String &p_uri) {
+Ref<RemoteDebuggerPeer> RemoteDebuggerPeerTCP::create_tcp(const String &p_uri) {
 	ERR_FAIL_COND_V(!p_uri.begins_with("tcp://"), nullptr);
 
 	String debug_host = p_uri.replace("tcp://", "");
@@ -237,7 +237,7 @@ RemoteDebuggerPeer *RemoteDebuggerPeerTCP::create_tcp(const String &p_uri) {
 	return memnew(RemoteDebuggerPeerTCP(stream));
 }
 
-RemoteDebuggerPeer *RemoteDebuggerPeerTCP::create_unix(const String &p_uri) {
+Ref<RemoteDebuggerPeer> RemoteDebuggerPeerTCP::create_unix(const String &p_uri) {
 	ERR_FAIL_COND_V(!p_uri.begins_with("unix://"), nullptr);
 
 	String debug_path = p_uri.replace("unix://", "");

core/debugger/remote_debugger_peer.h

@@ -82,8 +82,8 @@ class RemoteDebuggerPeerTCP : public RemoteDebuggerPeer {
 	static Error _try_connect(Ref<StreamPeerSocket> p_stream);
 
 public:
-	static RemoteDebuggerPeer *create_tcp(const String &p_uri);
-	static RemoteDebuggerPeer *create_unix(const String &p_uri);
+	static Ref<RemoteDebuggerPeer> create_tcp(const String &p_uri);
+	static Ref<RemoteDebuggerPeer> create_unix(const String &p_uri);
 
 	bool is_peer_connected() override;
 	int get_max_message_size() const override;

core/io/net_socket.cpp

@@ -30,9 +30,9 @@
 
 #include "net_socket.h"
 
-NetSocket *(*NetSocket::_create)() = nullptr;
+Ref<NetSocket> (*NetSocket::_create)() = nullptr;
 
-NetSocket *NetSocket::create() {
+Ref<NetSocket> NetSocket::create() {
 	if (_create) {
 		return _create();
 	}

core/io/net_socket.h

@@ -37,10 +37,10 @@ class NetSocket : public RefCounted {
 	GDSOFTCLASS(NetSocket, RefCounted);
 
 protected:
-	static NetSocket *(*_create)();
+	static Ref<NetSocket> (*_create)();
 
 public:
-	static NetSocket *create();
+	static Ref<NetSocket> create();
 
 	enum PollType : int32_t {
 		POLL_TYPE_IN,

core/io/resource_format_binary.cpp

@@ -750,7 +750,7 @@ Error ResourceLoaderBinary::load() {
 		Ref<Resource> res;
 		Resource *r = nullptr;
 
-		MissingResource *missing_resource = nullptr;
+		Ref<MissingResource> missing_resource;
 
 		if (main) {
 			res = ResourceLoader::get_resource_ref_override(local_path);
@@ -776,7 +776,7 @@ Error ResourceLoaderBinary::load() {
 						missing_resource = memnew(MissingResource);
 						missing_resource->set_original_class(t);
 						missing_resource->set_recording_properties(true);
-						obj = missing_resource;
+						obj = missing_resource.ptr();
 					} else {
 						error = ERR_FILE_CORRUPT;
 						ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, vformat("'%s': Resource of unrecognized type in file: '%s'.", local_path, t));
@@ -832,7 +832,7 @@ Error ResourceLoaderBinary::load() {
 			}
 
 			bool set_valid = true;
-			if (value.get_type() == Variant::OBJECT && missing_resource == nullptr && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
+			if (value.get_type() == Variant::OBJECT && missing_resource.is_null() && ResourceLoader::is_creating_missing_resources_if_class_unavailable_enabled()) {
 				// If the property being set is a missing resource (and the parent is not),
 				// then setting it will most likely not work.
 				// Instead, save it as metadata.
@@ -874,7 +874,7 @@ Error ResourceLoaderBinary::load() {
 			}
 		}
 
-		if (missing_resource) {
+		if (missing_resource.is_valid()) {
 			missing_resource->set_recording_properties(false);
 		}
 

core/io/udp_server.cpp

@@ -149,7 +149,6 @@ void UDPServer::set_max_pending_connections(int p_max) {
 		if (!E) {
 			break;
 		}
-		memdelete(E->get().peer);
 		pending.erase(E);
 	}
 }
@@ -192,7 +191,6 @@ void UDPServer::stop() {
 	E = pending.front();
 	while (E) {
 		E->get().peer->disconnect_shared_socket();
-		memdelete(E->get().peer);
 		E = E->next();
 	}
 	peers.clear();

core/io/udp_server.h

@@ -42,7 +42,7 @@ class UDPServer : public RefCounted {
 	};
 
 	struct Peer {
-		PacketPeerUDP *peer = nullptr;
+		Ref<PacketPeerUDP> peer;
 		IPAddress ip;
 		uint16_t port = 0;
 

core/math/static_raycaster.cpp

@@ -30,7 +30,7 @@
 
 #include "static_raycaster.h"
 
-StaticRaycaster *(*StaticRaycaster::create_function)() = nullptr;
+Ref<StaticRaycaster> (*StaticRaycaster::create_function)() = nullptr;
 
 Ref<StaticRaycaster> StaticRaycaster::create() {
 	if (create_function) {