arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-25 20:02:37 +03:00
Code

ESP8266httpClient crash-on-destructor bugfix (#5220)

Browse Source 
* Removed _client->stop() from destructor; some minor changes

* Changed BasicHttpsClient.ino to allocate BearSSL::WiFiClientSecure object on the heap in stead of stack
This commit is contained in:
Jeroen88 2018-10-12 00:34:25 +02:00 committed by Earle F. Philhower, III
parent 1b1b0a28a8
commit c8497da676
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/ESP8266HTTPClient/examples/BasicHttpsClient/BasicHttpsClient.ino
View File

@ -41,13 +41,14 @@ void loop() {
// wait for WiFi connection // wait for WiFi connection
if ((WiFiMulti.run() == WL_CONNECTED)) { if ((WiFiMulti.run() == WL_CONNECTED)) {
BearSSL::WiFiClientSecure client; BearSSL::WiFiClientSecure *client = new BearSSL::WiFiClientSecure;
client.setFingerprint(fingerprint);
client->setFingerprint(fingerprint);
HTTPClient https; HTTPClient https;
Serial.print("[HTTPS] begin...\n"); Serial.print("[HTTPS] begin...\n");
if (https.begin(client, "https://jigsaw.w3.org/HTTP/connection.html")) { // HTTPS if (https.begin(*client, "https://jigsaw.w3.org/HTTP/connection.html")) { // HTTPS
Serial.print("[HTTPS] GET...\n"); Serial.print("[HTTPS] GET...\n");
@ -72,6 +73,8 @@ void loop() {
} else { } else {
Serial.printf("[HTTPS] Unable to connect\n"); Serial.printf("[HTTPS] Unable to connect\n");
} }
delete client;
} }
delay(10000); delay(10000);

15
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View File

@ -123,7 +123,7 @@ HTTPClient::HTTPClient()
HTTPClient::~HTTPClient() HTTPClient::~HTTPClient()
{ {
if(_client) { if(_client) {
_client->stop(); DEBUG_HTTPCLIENT("[HTTP-Client][~HTTPClient] end() not called before destruction of HTTPClient\n");
} }
if(_currentHeaders) { if(_currentHeaders) {
delete[] _currentHeaders; delete[] _currentHeaders;
@ -196,7 +196,7 @@ bool HTTPClient::begin(WiFiClient &client, String host, uint16_t port, String ur
#ifdef HTTPCLIENT_1_1_COMPATIBLE #ifdef HTTPCLIENT_1_1_COMPATIBLE
bool HTTPClient::begin(String url, String httpsFingerprint) bool HTTPClient::begin(String url, String httpsFingerprint)
{ {
if(_client) _canReuse = false; _canReuse = false;
end(); end();
_port = 443; _port = 443;
@ -214,7 +214,7 @@ bool HTTPClient::begin(String url, String httpsFingerprint)
bool HTTPClient::begin(String url, const uint8_t httpsFingerprint[20]) bool HTTPClient::begin(String url, const uint8_t httpsFingerprint[20])
{ {
if(_client) _canReuse = false; _canReuse = false;
end(); end();
_port = 443; _port = 443;
@ -237,7 +237,7 @@ bool HTTPClient::begin(String url, const uint8_t httpsFingerprint[20])
*/ */
bool HTTPClient::begin(String url) bool HTTPClient::begin(String url)
{ {
if(_client) _canReuse = false; _canReuse = false;
end(); end();
_port = 80; _port = 80;
@ -299,7 +299,7 @@ bool HTTPClient::beginInternal(String url, const char* expectedProtocol)
#ifdef HTTPCLIENT_1_1_COMPATIBLE #ifdef HTTPCLIENT_1_1_COMPATIBLE
bool HTTPClient::begin(String host, uint16_t port, String uri) bool HTTPClient::begin(String host, uint16_t port, String uri)
{ {
if(_client) _canReuse = false; _canReuse = false;
end(); end();
clear(); clear();
@ -325,7 +325,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, bool https, Strin
bool HTTPClient::begin(String host, uint16_t port, String uri, String httpsFingerprint) bool HTTPClient::begin(String host, uint16_t port, String uri, String httpsFingerprint)
{ {
if(_client) _canReuse = false; _canReuse = false;
end(); end();
clear(); clear();
@ -343,7 +343,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, String httpsFinge
bool HTTPClient::begin(String host, uint16_t port, String uri, const uint8_t httpsFingerprint[20]) bool HTTPClient::begin(String host, uint16_t port, String uri, const uint8_t httpsFingerprint[20])
{ {
if(_client) _canReuse = false; _canReuse = false;
end(); end();
clear(); clear();
@ -367,6 +367,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const uint8_t htt
*/ */
void HTTPClient::end(void) void HTTPClient::end(void)
{ {
_canReuse = false;
disconnect(); disconnect();
clear(); clear();
} }