diff options
Diffstat (limited to 'Utilities/cmcurl/lib/security.c')
| -rw-r--r-- | Utilities/cmcurl/lib/security.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Utilities/cmcurl/lib/security.c b/Utilities/cmcurl/lib/security.c index c278406ba..76951548d 100644 --- a/Utilities/cmcurl/lib/security.c +++ b/Utilities/cmcurl/lib/security.c @@ -10,7 +10,7 @@ * Copyright (c) 1998, 1999, 2017 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * - * Copyright (C) 2001 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2001 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * All rights reserved. * @@ -120,7 +120,7 @@ static int ftp_send_command(struct connectdata *conn, const char *message, ...) char print_buffer[50]; va_start(args, message); - vsnprintf(print_buffer, sizeof(print_buffer), message, args); + mvsnprintf(print_buffer, sizeof(print_buffer), message, args); va_end(args); if(Curl_ftpsend(conn, print_buffer)) { @@ -142,7 +142,7 @@ socket_read(curl_socket_t fd, void *to, size_t len) { char *to_p = to; CURLcode result; - ssize_t nread; + ssize_t nread = 0; while(len > 0) { result = Curl_read_plain(fd, to_p, len, &nread); @@ -151,7 +151,6 @@ socket_read(curl_socket_t fd, void *to, size_t len) to_p += nread; } else { - /* FIXME: We are doing a busy wait */ if(result == CURLE_AGAIN) continue; return result; @@ -179,7 +178,6 @@ socket_write(struct connectdata *conn, curl_socket_t fd, const void *to, to_p += written; } else { - /* FIXME: We are doing a busy wait */ if(result == CURLE_AGAIN) continue; return result; @@ -265,13 +263,11 @@ static ssize_t sec_recv(struct connectdata *conn, int sockindex, total_read += bytes_read; buffer += bytes_read; } - /* FIXME: Check for overflow */ return total_read; } /* Send |length| bytes from |from| to the |fd| socket taking care of encoding and negociating with the server. |from| can be NULL. */ -/* FIXME: We don't check for errors nor report any! */ static void do_sec_send(struct connectdata *conn, curl_socket_t fd, const char *from, int length) { @@ -406,18 +402,14 @@ int Curl_sec_read_msg(struct connectdata *conn, char *buffer, if(buf[decoded_len - 1] == '\n') buf[decoded_len - 1] = '\0'; - /* FIXME: Is |buffer| length always greater than |decoded_len|? */ strcpy(buffer, buf); free(buf); return ret_code; } -/* FIXME: The error code returned here is never checked. */ static int sec_set_protection_level(struct connectdata *conn) { int code; - char *pbsz; - static unsigned int buffer_size = 1 << 20; /* 1048576 */ enum protection_level level = conn->request_data_prot; DEBUGASSERT(level > PROT_NONE && level < PROT_LAST); @@ -433,6 +425,9 @@ static int sec_set_protection_level(struct connectdata *conn) return 0; if(level) { + char *pbsz; + static unsigned int buffer_size = 1 << 20; /* 1048576 */ + code = ftp_send_command(conn, "PBSZ %u", buffer_size); if(code < 0) return -1; @@ -508,7 +503,6 @@ static CURLcode choose_mech(struct connectdata *conn) infof(data, "Trying mechanism %s...\n", mech->name); ret = ftp_send_command(conn, "AUTH %s", mech->name); if(ret < 0) - /* FIXME: This error is too generic but it is OK for now. */ return CURLE_COULDNT_CONNECT; if(ret/100 != 3) { @@ -575,7 +569,6 @@ Curl_sec_end(struct connectdata *conn) conn->in_buffer.data = NULL; conn->in_buffer.size = 0; conn->in_buffer.index = 0; - /* FIXME: Is this really needed? */ conn->in_buffer.eof_flag = 0; } conn->sec_complete = 0; |