mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix some Coverity bugs

Browse Source
This commit is contained in:
twinaphex 2017-03-19 02:27:07 +01:00
parent b8830815ab
commit c9c0621076
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libretro-common/net/net_http.c
View File

@ -90,10 +90,11 @@ void urlencode_lut_init()
} }
/* caller is responsible for deleting the destination buffer */ /* caller is responsible for deleting the destination buffer */
void net_http_urlencode_full(char **dest, const char *source) { void net_http_urlencode_full(char **dest, const char *source)
{
char *enc = NULL;
/* Assume every character will be encoded, so we need 3 times the space. */ /* Assume every character will be encoded, so we need 3 times the space. */
size_t len = strlen(source) * 3 + 1; size_t len = strlen(source) * 3 + 1;
char *enc;
if (!urlencode_lut_inited) if (!urlencode_lut_inited)
urlencode_lut_init(); urlencode_lut_init();
@ -120,7 +121,9 @@ static int net_http_new_socket(const char *domain, int port)
{ {
int ret; int ret;
struct addrinfo *addr = NULL; struct addrinfo *addr = NULL;
int fd = socket_init((void**)&addr, port, domain, SOCKET_TYPE_STREAM); int fd = socket_init(
(void**)&addr, port, domain, SOCKET_TYPE_STREAM);
if (fd < 0) if (fd < 0)
return -1; return -1;
@ -150,19 +153,23 @@ static void net_http_send_str(int fd, bool *error, const char *text)
*error = true; *error = true;
} }
struct http_connection_t *net_http_connection_new(const char *url, const char *method, const char *data) struct http_connection_t *net_http_connection_new(const char *url,
const char *method, const char *data)
{ {
char **domain = NULL; char **domain = NULL;
struct http_connection_t *conn = (struct http_connection_t*)calloc(1, struct http_connection_t *conn = (struct http_connection_t*)calloc(1,
sizeof(struct http_connection_t)); sizeof(struct http_connection_t));
if (!conn || !url) if (!conn)
return NULL; return NULL;
conn->urlcopy = strdup(url); if (!url)
goto error;
conn->urlcopy = strdup(url);
if (method) if (method)
conn->methodcopy = strdup(method); conn->methodcopy = strdup(method);
if (data) if (data)
conn->postdatacopy = strdup(data); conn->postdatacopy = strdup(data);
@ -186,8 +193,8 @@ error:
free(conn->methodcopy); free(conn->methodcopy);
if (conn->postdatacopy) if (conn->postdatacopy)
free(conn->postdatacopy); free(conn->postdatacopy);
conn->urlcopy = NULL; conn->urlcopy = NULL;
conn->methodcopy = NULL; conn->methodcopy = NULL;
conn->postdatacopy = NULL; conn->postdatacopy = NULL;
free(conn); free(conn);
return NULL; return NULL;
@ -320,13 +327,14 @@ struct http_t *net_http_new(struct http_connection_t *conn)
if (conn->methodcopy && string_is_equal(conn->methodcopy, "POST")) if (conn->methodcopy && string_is_equal(conn->methodcopy, "POST"))
{ {
size_t post_len, len; size_t post_len, len;
char *len_str; char *len_str = NULL;
if (!conn->postdatacopy) if (!conn->postdatacopy)
goto error; goto error;
if (!conn->contenttypecopy) if (!conn->contenttypecopy)
net_http_send_str(fd, &error, "Content-Type: application/x-www-form-urlencoded\r\n"); net_http_send_str(fd, &error,
"Content-Type: application/x-www-form-urlencoded\r\n");
net_http_send_str(fd, &error, "Content-Length: "); net_http_send_str(fd, &error, "Content-Length: ");
@ -345,6 +353,8 @@ struct http_t *net_http_new(struct http_connection_t *conn)
net_http_send_str(fd, &error, len_str); net_http_send_str(fd, &error, len_str);
net_http_send_str(fd, &error, "\r\n"); net_http_send_str(fd, &error, "\r\n");
free(len_str);
} }
net_http_send_str(fd, &error, "User-Agent: libretro\r\n"); net_http_send_str(fd, &error, "User-Agent: libretro\r\n");
@ -409,7 +419,8 @@ bool net_http_update(struct http_t *state, size_t* progress, size_t* total)
newlen = -1; newlen = -1;
else else
newlen = socket_receive_all_nonblocking(state->fd, &state->error, newlen = socket_receive_all_nonblocking(state->fd, &state->error,
(uint8_t*)state->data + state->pos, state->buflen - state->pos); (uint8_t*)state->data + state->pos,
state->buflen - state->pos);
if (newlen < 0) if (newlen < 0)
goto fail; goto fail;
@ -417,7 +428,7 @@ bool net_http_update(struct http_t *state, size_t* progress, size_t* total)
if (state->pos + newlen >= state->buflen - 64) if (state->pos + newlen >= state->buflen - 64)
{ {
state->buflen *= 2; state->buflen *= 2;
state->data = (char*)realloc(state->data, state->buflen); state->data = (char*)realloc(state->data, state->buflen);
} }
state->pos += newlen; state->pos += newlen;
@ -428,7 +439,9 @@ bool net_http_update(struct http_t *state, size_t* progress, size_t* total)
if (!lineend) if (!lineend)
break; break;
*lineend='\0'; *lineend='\0';
if (lineend != state->data && lineend[-1]=='\r') if (lineend != state->data && lineend[-1]=='\r')
lineend[-1]='\0'; lineend[-1]='\0';