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

lib: stop NULL-checking conn->passwd and ->user

Browse Source 
They always point to a string. The string might be zero length.

Closes #19059
This commit is contained in:
Daniel Stenberg 2025-10-14 14:43:46 +02:00
parent 5e46318414
commit 62961d6cc5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ftp.c
View File

@ -2606,7 +2606,7 @@ static CURLcode ftp_state_user_resp(struct Curl_easy *data,
/* 331 Password required for ...
(the server requires to send the user's password too) */
result = Curl_pp_sendf(data, &ftpc->pp, "PASS %s",
data->conn->passwd ? data->conn->passwd : "");
data->conn->passwd);
if(!result)
ftp_state(data, ftpc, FTP_PASS);
}

3
lib/pop3.c
View File

@ -1057,8 +1057,7 @@ static CURLcode pop3_state_user_resp(struct Curl_easy *data, int pop3code,
}
else
/* Send the PASS command */
result = Curl_pp_sendf(data, &pop3c->pp, "PASS %s",
conn->passwd ? conn->passwd : "");
result = Curl_pp_sendf(data, &pop3c->pp, "PASS %s", conn->passwd);
if(!result)
pop3_state(data, POP3_PASS);

9
lib/vssh/libssh2.c
View File

@ -3335,14 +3335,9 @@ static CURLcode ssh_connect(struct Curl_easy *data, bool *done)
function to make the reuse checks properly be able to check this bit. */
connkeep(conn, "SSH default");
if(conn->user)
infof(data, "User: '%s'", conn->user);
else
infof(data, "User: NULL");
infof(data, "User: '%s'", conn->user);
#ifdef CURL_LIBSSH2_DEBUG
if(conn->passwd) {
infof(data, "Password: %s", conn->passwd);
}
infof(data, "Password: %s", conn->passwd);
sock = conn->sock[FIRSTSOCKET];
#endif /* CURL_LIBSSH2_DEBUG */