WiFiClient::remoteIP: fix nullptr crash (#5634)

d-a-v · devyte · commit b6664352823a · 2019-01-18T22:08:32.000-03:00
diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -351,10 +351,10 @@ WiFiClient::operator bool()
 
 IPAddress WiFiClient::remoteIP()
 {
-    if (!_client)
+    if (!_client || !_client->getRemoteAddress())
         return IPAddress(0U);
 
-    return IPAddress(_client->getRemoteAddress());
+    return _client->getRemoteAddress();
 }
 
 uint16_t WiFiClient::remotePort()

Original file line number	Diff line number	Diff line change
`@@ -351,10 +351,10 @@ WiFiClient::operator bool()`
`351`	`351`
`352`	`352`	`IPAddress WiFiClient::remoteIP()`
`353`	`353`	`{`
`354`		`- if (!_client)`
	`354`	`+ if (!_client \|\| !_client->getRemoteAddress())`
`355`	`355`	`return IPAddress(0U);`
`356`	`356`
`357`		`- return IPAddress(_client->getRemoteAddress());`
	`357`	`+ return _client->getRemoteAddress();`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`uint16_t WiFiClient::remotePort()`