Skip to content

Core: Remove implicit conversions from IPAddress to String, to avoid accidental conversions #107406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025
Merged

Core: Remove implicit conversions from IPAddress to String, to avoid accidental conversions #107406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/io/ip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ PackedStringArray IP::_get_local_addresses() const {
List<IPAddress> ip_addresses;
get_local_addresses(&ip_addresses);
for (const IPAddress &E : ip_addresses) {
addresses.push_back(E);
addresses.push_back(String(E));
}

return addresses;
Expand Down
2 changes: 1 addition & 1 deletion core/io/ip_address.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ struct [[nodiscard]] IPAddress {
const uint8_t *get_ipv6() const;
void set_ipv6(const uint8_t *p_buf);

operator String() const;
explicit operator String() const;
IPAddress(const String &p_string);
IPAddress(uint32_t p_a, uint32_t p_b, uint32_t p_c, uint32_t p_d, bool is_v6 = false);
IPAddress() { clear(); }
Expand Down
2 changes: 1 addition & 1 deletion core/io/packet_peer_udp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Error PacketPeerUDP::leave_multicast_group(IPAddress p_multi_address, const Stri
}

String PacketPeerUDP::_get_packet_ip() const {
return get_packet_address();
return String(get_packet_address());
}

Error PacketPeerUDP::_set_dest_address(const String &p_address, int p_port) {
Expand Down
2 changes: 1 addition & 1 deletion core/variant/variant_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ struct VariantInternalAccessor<const T *> {
template <>
struct VariantInternalAccessor<IPAddress> {
static _FORCE_INLINE_ IPAddress get(const Variant *v) { return IPAddress(*VariantInternal::get_string(v)); }
static _FORCE_INLINE_ void set(Variant *v, IPAddress p_value) { *VariantInternal::get_string(v) = p_value; }
static _FORCE_INLINE_ void set(Variant *v, IPAddress p_value) { *VariantInternal::get_string(v) = String(p_value); }
};

template <>
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,12 +1386,12 @@ void EditorSettings::setup_network() {
}
// Select current IP (found)
if (ip == current) {
selected = ip;
selected = String(ip);
}
if (!hint.is_empty()) {
hint += ",";
}
hint += ip;
hint += String(ip);
}

// Add hints with valid IP addresses to remote_host property.
Expand Down