moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

security.c: removed superfluous parentheses

Browse Source 
And also removed the FIXME where memory was zeroed just before freed,
and some other minor whitespace changes.
This commit is contained in:
Daniel Stenberg 2010-09-22 23:41:28 +02:00
parent 31d59fb2cc
commit b1df37c60e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/security.c
View File

@ -143,8 +143,8 @@ static int ftp_send_command(struct connectdata *conn, const char *message, ...)
return ftp_code; return ftp_code;
} }
/* Read |len| from the socket |fd| and store it in |to|. Return a /* Read |len| from the socket |fd| and store it in |to|. Return a CURLcode
CURLcode saying whether an error occured or CURLE_OK if |len| was read. */ saying whether an error occured or CURLE_OK if |len| was read. */
static CURLcode static CURLcode
socket_read(curl_socket_t fd, void *to, size_t len) socket_read(curl_socket_t fd, void *to, size_t len)
{ {
@ -170,9 +170,11 @@ socket_read(curl_socket_t fd, void *to, size_t len)
/* Write |len| bytes from the buffer |to| to the socket |fd|. Return a /* Write |len| bytes from the buffer |to| to the socket |fd|. Return a
CURLcode saying whether an error occured or CURLE_OK if |len| was written. */ CURLcode saying whether an error occured or CURLE_OK if |len| was
written. */
static CURLcode static CURLcode
socket_write(struct connectdata *conn, curl_socket_t fd, const void *to, size_t len) socket_write(struct connectdata *conn, curl_socket_t fd, const void *to,
size_t len)
{ {
const char *to_p = to; const char *to_p = to;
CURLcode code; CURLcode code;
@ -214,8 +216,8 @@ static CURLcode read_data(struct connectdata *conn,
ret = socket_read(fd, buf->data, len); ret = socket_read(fd, buf->data, len);
if (ret != CURLE_OK) if (ret != CURLE_OK)
return ret; return ret;
buf->size = (conn->mech->decode)(conn->app_data, buf->data, len, buf->size = conn->mech->decode(conn->app_data, buf->data, len,
conn->data_prot, conn); conn->data_prot, conn);
buf->index = 0; buf->index = 0;
return CURLE_OK; return CURLE_OK;
} }
@ -288,8 +290,8 @@ static void do_sec_send(struct connectdata *conn, curl_socket_t fd,
else else
prot_level = conn->command_prot; prot_level = conn->command_prot;
} }
bytes = (conn->mech->encode)(conn->app_data, from, length, prot_level, bytes = conn->mech->encode(conn->app_data, from, length, prot_level,
(void**)&buffer, conn); (void**)&buffer, conn);
if(iscmd) { if(iscmd) {
bytes = Curl_base64_encode(conn->data, buffer, bytes, &cmd_buffer); bytes = Curl_base64_encode(conn->data, buffer, bytes, &cmd_buffer);
if(bytes > 0) { if(bytes > 0) {
@ -322,7 +324,7 @@ static ssize_t sec_write(struct connectdata *conn, curl_socket_t fd,
ssize_t len = conn->buffer_size; ssize_t len = conn->buffer_size;
int tx = 0; int tx = 0;
len -= (conn->mech->overhead)(conn->app_data, conn->data_prot, len); len -= conn->mech->overhead(conn->app_data, conn->data_prot, len);
if(len <= 0) if(len <= 0)
len = length; len = length;
while(length) { while(length) {
@ -373,8 +375,8 @@ int Curl_sec_read_msg(struct connectdata *conn, char *buffer, int level)
return -1; return -1;
} }
decoded_len = (conn->mech->decode)(conn->app_data, buf, decoded_len, decoded_len = conn->mech->decode(conn->app_data, buf, decoded_len,
level, conn); level, conn);
if(decoded_len <= 0) { if(decoded_len <= 0) {
free(buf); free(buf);
return -1; return -1;
@ -535,7 +537,7 @@ static CURLcode choose_mech(struct connectdata *conn)
} }
/* Authenticate */ /* Authenticate */
ret = ((*mech)->auth)(conn->app_data, conn); ret = (*mech)->auth(conn->app_data, conn);
if(ret == AUTH_CONTINUE) if(ret == AUTH_CONTINUE)
continue; continue;
@ -576,9 +578,7 @@ Curl_sec_end(struct connectdata *conn)
{ {
if(conn->mech != NULL) { if(conn->mech != NULL) {
if(conn->mech->end) if(conn->mech->end)
(conn->mech->end)(conn->app_data); conn->mech->end(conn->app_data);
/* FIXME: Why do we zero'd it before free'ing it? */
memset(conn->app_data, 0, conn->mech->size);
free(conn->app_data); free(conn->app_data);
conn->app_data = NULL; conn->app_data = NULL;
} }