arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

fix some memory leek

Browse Source 
still looses 40Byte some where?!
This commit is contained in:
Markus Sattler 2015-11-22 16:37:29 +01:00
parent 6ed7dfe537
commit 497ab25040
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libraries/ESP8266httpClient/src/ESP8266httpClient.cpp
View File

@ -28,6 +28,9 @@
#include "ESP8266httpClient.h" #include "ESP8266httpClient.h"
/**
* constractor
*/
httpClient::httpClient() { httpClient::httpClient() {
_tcp = NULL; _tcp = NULL;
_tcps = NULL; _tcps = NULL;
@ -43,17 +46,35 @@ httpClient::httpClient() {
} }
/**
* deconstractor
*/
httpClient::~httpClient() { httpClient::~httpClient() {
if(connected()) {
if(_tcps) {
_tcps->stop();
_tcps->~WiFiClientSecure();
_tcps = NULL;
_tcp = NULL;
} else if(_tcp) {
_tcp->stop(); _tcp->stop();
_tcp->~WiFiClient();
_tcp = NULL;
} }
if(_currentHeaders) { if(_currentHeaders) {
delete[] _currentHeaders; delete[] _currentHeaders;
} }
_headerKeysCount = 0;
} }
/**
* begin
* @param host const char *
* @param port uint16_t
* @param url const char *
* @param https bool
* @param httpsFingerprint const char *
*/
void httpClient::begin(const char *host, uint16_t port, const char * url, bool https, const char * httpsFingerprint) { void httpClient::begin(const char *host, uint16_t port, const char * url, bool https, const char * httpsFingerprint) {
DEBUG_HTTPCLIENT("[HTTP-Client][begin] host: %s port:%d url: %s https: %d httpsFingerprint: %s\n", host, port, url, https, httpsFingerprint); DEBUG_HTTPCLIENT("[HTTP-Client][begin] host: %s port:%d url: %s https: %d httpsFingerprint: %s\n", host, port, url, https, httpsFingerprint);
@ -98,7 +119,7 @@ void httpClient::end(void) {
*/ */
bool httpClient::connected() { bool httpClient::connected() {
if(_tcp) { if(_tcp) {
return _tcp->connected(); return (_tcp->connected() || (_tcp->available() > 0));
} }
return false; return false;
} }
@ -317,12 +338,22 @@ bool httpClient::connect(void) {
return true; return true;
} }
if(_https) { if(_https) {
DEBUG_HTTPCLIENT("[HTTP-Client] connect https...\n"); DEBUG_HTTPCLIENT("[HTTP-Client] connect https...\n");
if(_tcps) {
_tcps->~WiFiClient();
_tcps = NULL;
_tcp = NULL;
}
_tcps = new WiFiClientSecure(); _tcps = new WiFiClientSecure();
_tcp = _tcps; _tcp = _tcps;
} else { } else {
DEBUG_HTTPCLIENT("[HTTP-Client] connect http...\n"); DEBUG_HTTPCLIENT("[HTTP-Client] connect http...\n");
if(_tcp) {
_tcp->~WiFiClient();
_tcp = NULL;
}
_tcp = new WiFiClient(); _tcp = new WiFiClient();
} }