git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-13 12:41:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ldap: avoid null ptr deref on failure

Browse Source 
ldap_get_dn() can return NULL on error

Reported-by: Joshua Rogers
Closes #18988
This commit is contained in:
Daniel Stenberg 2025-10-09 23:03:18 +02:00
parent 0d560d00fa
commit 69efbcaa03
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ldap.c
View File

@ -535,7 +535,7 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
/* Get the DN and write it to the client */
{
char *name;
size_t name_len;
size_t name_len = 0;
#ifdef USE_WIN32_LDAP
TCHAR *dn = ldap_get_dn(server, entryIterator);
name = curlx_convert_tchar_to_UTF8(dn);
@ -549,32 +549,20 @@ static CURLcode ldap_do(struct Curl_easy *data, bool *done)
#else
char *dn = name = ldap_get_dn(server, entryIterator);
#endif
name_len = strlen(name);
result = Curl_client_write(data, CLIENTWRITE_BODY, "DN: ", 4);
if(result) {
FREE_ON_WINLDAP(name);
ldap_memfree(dn);
goto quit;
if(!name)
result = CURLE_FAILED_INIT;
else {
name_len = strlen(name);
result = Curl_client_write(data, CLIENTWRITE_BODY, "DN: ", 4);
}
result = Curl_client_write(data, CLIENTWRITE_BODY, name, name_len);
if(result) {
FREE_ON_WINLDAP(name);
ldap_memfree(dn);
goto quit;
}
result = Curl_client_write(data, CLIENTWRITE_BODY, "\n", 1);
if(result) {
FREE_ON_WINLDAP(name);
ldap_memfree(dn);
goto quit;
}
if(!result)
result = Curl_client_write(data, CLIENTWRITE_BODY, name, name_len);
if(!result)
result = Curl_client_write(data, CLIENTWRITE_BODY, "\n", 1);
FREE_ON_WINLDAP(name);
ldap_memfree(dn);
if(result)
goto quit;
}
/* Get the attributes and write them to the client */