romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-24 12:16:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

ldap: fix minor leak on write callback error

Browse source 
The 'ber' pointer could remain allocated in the exit path if the write
callback returned error for one of the Curl_client_write() calls.

Reported-by: Andrew Nesbit
Closes #21530
This commit is contained in:
Daniel Stenberg 2026-05-07 18:02:35 +02:00
parent df315692d7
commit 9249aad4c2
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/ldap.c
View file

@ -256,6 +256,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
char *passwd = NULL;
struct ip_quadruple ipquad;
bool is_ipv6;
BerElement *ber = NULL;
*done = TRUE; /* unconditionally */
infof(data, "LDAP local: LDAP Vendor = %s ; LDAP Version = %d",
@ -427,7 +428,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
for(entryIterator = ldap_first_entry(server, ldapmsg);
entryIterator;
entryIterator = ldap_next_entry(server, entryIterator), num++) {
BerElement *ber = NULL;
#ifdef USE_WIN32_LDAP
TCHAR *attribute;
#else
@ -477,11 +477,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
#ifdef USE_WIN32_LDAP
char *attr = curlx_convert_tchar_to_UTF8(attribute);
if(!attr) {
if(ber)
ber_free(ber, 0);
result = CURLE_OUT_OF_MEMORY;
goto quit;
}
#else
@ -497,9 +493,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
@ -508,9 +501,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
@ -519,9 +509,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
@ -536,9 +523,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
@ -550,9 +534,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
}
@ -565,9 +546,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
}
@ -577,9 +555,6 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
ldap_value_free_len(vals);
FREE_ON_WINLDAP(attr);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit;
}
}
@ -597,11 +572,15 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
goto quit;
}
if(ber)
if(ber) {
ber_free(ber, 0);
ber = NULL;
}
}
quit:
if(ber)
ber_free(ber, 0);
if(ldapmsg) {
ldap_msgfree(ldapmsg);
LDAP_TRACE(("Received %d entries\n", num));