Skip to content

Fix memory leak on stream load when updating CA Certificate #6062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix memory leak on stream load when updating CA Certificate #6062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b31484
Temporary fix
sguarin Nov 27, 2021
dee2f0e
Merge remote-tracking branch 'upstream/master' into fix_streamLoad
sguarin Nov 27, 2021
1e962d3
Fix realloc return of new pointer
sguarin Dec 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,21 +261,25 @@ void WiFiClientSecure::setInsecure()
void WiFiClientSecure::setCACert (const char *rootCA)
{
_CA_cert = rootCA;
_use_insecure = false;
}

void WiFiClientSecure::setCertificate (const char *client_ca)
{
_cert = client_ca;
_use_insecure = false;
}

void WiFiClientSecure::setPrivateKey (const char *private_key)
{
_private_key = private_key;
_use_insecure = false;
}

void WiFiClientSecure::setPreSharedKey(const char *pskIdent, const char *psKey) {
_pskIdent = pskIdent;
_psKey = psKey;
_use_insecure = false;
}

bool WiFiClientSecure::verify(const char* fp, const char* domain_name)
Expand All @@ -300,8 +304,23 @@ char *WiFiClientSecure::_streamLoad(Stream& stream, size_t size) {
return dest;
}

bool WiFiClientSecure::_streamLoad(char **destPtr, Stream& stream, size_t size) {
*destPtr = (char*)realloc(*destPtr, size+1);
if (!*destPtr) {
return false;
}
if (size != stream.readBytes(*destPtr, size)) {
free(*destPtr);
*destPtr = nullptr;
return false;
}
(*destPtr)[size] = '\0';
return true;
}

bool WiFiClientSecure::loadCACert(Stream& stream, size_t size) {
char *dest = _streamLoad(stream, size);
char *dest = _CA_cert;
_streamLoad(&dest, stream, size);
bool ret = false;
if (dest) {
setCACert(dest);
Expand Down
2 changes: 2 additions & 0 deletions libraries/WiFiClientSecure/src/WiFiClientSecure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class WiFiClientSecure : public WiFiClient
void setAlpnProtocols(const char **alpn_protos);
const mbedtls_x509_crt* getPeerCertificate() { return mbedtls_ssl_get_peer_cert(&sslclient->ssl_ctx); };
bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); };

int setTimeout(uint32_t seconds){ return 0; }

operator bool()
Expand Down Expand Up @@ -105,6 +106,7 @@ class WiFiClientSecure : public WiFiClient

private:
char *_streamLoad(Stream& stream, size_t size);
bool _streamLoad(char **destPtr, Stream& stream, size_t size);

//friend class WiFiServer;
using Print::write;
Expand Down