summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-11-18 15:15:24 +0100
committerGitHub <noreply@github.com>2018-11-18 15:15:24 +0100
commit4a050568a28898a45cebe350f31bb2af867b32ff (patch)
tree3e2f09978d4cdaa452f355b9206f6c6b2de8733c /core
parent35b421b6954c5baff4b4fd4bc56b09c85dae6ff5 (diff)
parent1ef9e9ef6abc8070f5259f11a79c352580e45049 (diff)
Merge pull request #23798 from Faless/socket_ipv4_wildcard_fix
Properly accept wildcard when binding IPv4 socket.
Diffstat (limited to 'core')
-rw-r--r--core/io/ip_address.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/ip_address.cpp b/core/io/ip_address.cpp
index 6d979d10eb..194d1af6bf 100644
--- a/core/io/ip_address.cpp
+++ b/core/io/ip_address.cpp
@@ -184,7 +184,7 @@ bool IP_Address::is_ipv4() const {
}
const uint8_t *IP_Address::get_ipv4() const {
- ERR_FAIL_COND_V(!is_ipv4(), 0);
+ ERR_FAIL_COND_V(!is_ipv4(), &(field8[12])); // Not the correct IPv4 (it's an IPv6), but we don't want to return a null pointer risking an engine crash.
return &(field8[12]);
}