From 38ae7a0cd765d7fcc431d4683701d12af56a5390 Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Thu, 18 Jan 2018 15:38:41 +0100
Subject: [PATCH] check ClientContext's this and _pcb once out of the
 ::connect() delay fix #4078

---
 libraries/ESP8266WiFi/src/include/ClientContext.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
index b2628f8032..43e9040a48 100644
--- a/libraries/ESP8266WiFi/src/include/ClientContext.h
+++ b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -131,6 +131,11 @@ class ClientContext
         _op_start_time = millis();
         // This delay will be interrupted by esp_schedule in the connect callback
         delay(_timeout_ms);
+        // WiFi may have vanished during the delay (#4078)
+        if (!this || !_pcb) {
+            DEBUGV(":vnsh\r\n");
+            return 0;
+        }
         _connect_pending = 0;
         if (state() != ESTABLISHED) {
             abort();