62961d6cc5
Daniel Stenberg
2025-10-15
Subject
lib: stop NULL-checking conn->passwd and ->user
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/ftp.c+1 -1
| @@ -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); | |
| } | |
lib/pop3.c+1 -2
| @@ -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); | |
lib/vssh/libssh2.c+2 -7
| @@ -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 */ | |