The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-12-25 19:31:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131 from wiidev/master

Browse Source 
Fix a minor memory leak
This commit is contained in:
Fledge68 2019-11-06 16:29:50 -06:00 committed by GitHub
commit 60e231e43f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/network/https.c
View File

@ -8,7 +8,6 @@
#include <network.h> #include <network.h>
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h>
#include "https.h" #include "https.h"
#include "gecko/gecko.hpp" #include "gecko/gecko.hpp"
@ -62,27 +61,28 @@ void https_close(HTTP_INFO *httpinfo)
#endif #endif
} }
char *get_header_value(struct phr_header *headers, size_t num_headers, char *header) u8 get_header_value(struct phr_header *headers, size_t num_headers, char *dst, char *header)
{ {
for (size_t i = 0; i != num_headers; ++i) for (size_t i = 0; i != num_headers; ++i)
{ {
char *header_name = strndup(headers[i].name, headers[i].name_len); if (strncasecmp(header, headers[i].name, headers[i].name_len) == 0)
char *header_value = strndup(headers[i].value, headers[i].value_len); {
if (strcasecmp(header_name, header) == 0) strlcpy(dst, headers[i].value, headers[i].value_len + 1);
return header_value; return 1;
}
} }
return NULL; return 0;
} }
u8 is_chunked(struct phr_header *headers, size_t num_headers) u8 is_chunked(struct phr_header *headers, size_t num_headers)
{ {
char *header = get_header_value(headers, num_headers, "transfer-encoding"); char encoding[10] = {};
if (header == NULL) if (!get_header_value(headers, num_headers, encoding, "transfer-encoding"))
return 0; return 0;
return (strcasecmp(header, "chunked") == 0) ? 1 : 0; return (strcasecmp(encoding, "chunked") == 0) ? 1 : 0;
} }
int read_chunked(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos) void read_chunked(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos)
{ {
struct phr_chunked_decoder decoder = {}; struct phr_chunked_decoder decoder = {};
size_t capacity = 4096, rsize; size_t capacity = 4096, rsize;
@ -100,35 +100,32 @@ int read_chunked(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos)
#endif #endif
capacity *= 2; capacity *= 2;
buffer->data = realloc(buffer->data, capacity); buffer->data = realloc(buffer->data, capacity);
assert(buffer->data != NULL);
} }
while ((rret = https_read(httpinfo, buffer->data + start_pos, capacity - start_pos)) == -1 && errno == EINTR) while ((rret = https_read(httpinfo, &buffer->data[start_pos], capacity - start_pos)) == -1 && errno == EINTR)
; ;
if (rret <= 0) if (rret <= 0)
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
gprintf("IO error\n"); gprintf("IO error\n");
#endif #endif
return -1; return;
} }
rsize = rret; rsize = rret;
pret = phr_decode_chunked(&decoder, buffer->data + start_pos, &rsize); pret = phr_decode_chunked(&decoder, &buffer->data[start_pos], &rsize);
if (pret == -1) if (pret == -1)
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
gprintf("Parse error\n"); gprintf("Parse error\n");
#endif #endif
return -2; return;
} }
start_pos += rsize; start_pos += rsize;
} while (pret == -2); } while (pret == -2);
assert(pret >= 0);
buffer->size = start_pos; buffer->size = start_pos;
buffer->data = realloc(buffer->data, buffer->size); buffer->data = realloc(buffer->data, buffer->size);
return start_pos;
} }
int read_all(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos) void read_all(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos)
{ {
size_t capacity = 4096; size_t capacity = 4096;
ssize_t ret; ssize_t ret;
@ -144,9 +141,8 @@ int read_all(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos)
#endif #endif
capacity *= 2; capacity *= 2;
buffer->data = realloc(buffer->data, capacity); buffer->data = realloc(buffer->data, capacity);
assert(buffer->data != NULL);
} }
while ((ret = https_read(httpinfo, buffer->data + start_pos, capacity - start_pos)) == -1 && errno == EINTR) while ((ret = https_read(httpinfo, &buffer->data[start_pos], capacity - start_pos)) == -1 && errno == EINTR)
; ;
if (ret <= 0) if (ret <= 0)
break; break;
@ -155,7 +151,6 @@ int read_all(HTTP_INFO *httpinfo, struct download *buffer, size_t start_pos)
}; };
buffer->size = start_pos; buffer->size = start_pos;
buffer->data = realloc(buffer->data, buffer->size); buffer->data = realloc(buffer->data, buffer->size);
return start_pos;
} }
int connect(char *host, u16 port) int connect(char *host, u16 port)
@ -363,12 +358,12 @@ void downloadfile(const char *url, struct download *buffer)
while (1) while (1)
{ {
// Read the response // Read the response
while ((rret = https_read(&httpinfo, response + buflen, 1)) == -1 && errno == EINTR) while ((rret = https_read(&httpinfo, &response[buflen], 1)) == -1 && errno == EINTR)
; ;
if (rret <= 0) if (rret <= 0)
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
gprintf("rret error %i", rret); gprintf("rret error %i\n", rret);
#endif #endif
https_close(&httpinfo); https_close(&httpinfo);
return; return;
@ -383,13 +378,12 @@ void downloadfile(const char *url, struct download *buffer)
else if (pret == -1) else if (pret == -1)
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
gprintf("pret error %i", pret); gprintf("pret error %i\n", pret);
#endif #endif
https_close(&httpinfo); https_close(&httpinfo);
return; return;
} }
// Response is incomplete so continue the loop // Response is incomplete so continue the loop
assert(pret == -2);
if (buflen == sizeof(response)) if (buflen == sizeof(response))
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
@ -407,18 +401,18 @@ void downloadfile(const char *url, struct download *buffer)
if (loop == REDIRECT_LIMIT) if (loop == REDIRECT_LIMIT)
{ {
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
gprintf("Reached redirect limit"); gprintf("Reached redirect limit\n");
#endif #endif
return; return;
} }
loop++; loop++;
char *header = get_header_value(headers, num_headers, "location"); char location[2100] = {};
if (header == NULL) if (!get_header_value(headers, num_headers, location, "location"))
return; return;
#ifdef DEBUG_NETWORK #ifdef DEBUG_NETWORK
gprintf("Redirect #%i - %s\n", loop, header); gprintf("Redirect #%i - %s\n", loop, location);
#endif #endif
downloadfile(header, buffer); downloadfile(location, buffer);
return; return;
} }
// It's not 301 or 302, so reset the loop // It's not 301 or 302, so reset the loop
@ -428,7 +422,7 @@ void downloadfile(const char *url, struct download *buffer)
{ {
buffer->data = malloc(4096); buffer->data = malloc(4096);
buffer->size = 4096; buffer->size = 4096;
memcpy(buffer->data, response + pret, buflen - pret); memcpy(buffer->data, &response[pret], buflen - pret);
// Determine how to read the data // Determine how to read the data
if (is_chunked(headers, num_headers)) if (is_chunked(headers, num_headers))
read_chunked(&httpinfo, buffer, buflen - pret); read_chunked(&httpinfo, buffer, buflen - pret);