mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 17:22:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve data scheme fetcher allocation

Browse Source 
The data scheme fetcher was over allocating the space for decoded
base64 encoded urls and not using the base64 API that allocated the
correct size storage.
This commit is contained in:
Vincent Sanders 2014-11-17 16:05:17 +00:00
parent d83935f0bd
commit d4c7a0ff77
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/fetchers/data.c
View File

@ -146,7 +146,7 @@ static bool fetch_data_process(struct fetch_data_context *c)
char *params; char *params;
char *comma; char *comma;
char *unescaped; char *unescaped;
int templen; int unescaped_len;
/* format of a data: URL is: /* format of a data: URL is:
* data:[<mimetype>][;base64],<data> * data:[<mimetype>][;base64],<data>
@ -198,12 +198,10 @@ static bool fetch_data_process(struct fetch_data_context *c)
c->base64 = false; c->base64 = false;
} }
/* we URL unescape the data first, just incase some insane page /* URL unescape the data first, just incase some insane page
* decides to nest URL and base64 encoding. Like, say, Acid2. * decides to nest URL and base64 encoding. Like, say, Acid2.
*/ */
templen = c->datalen; unescaped = curl_easy_unescape(curl, comma + 1, 0, &unescaped_len);
unescaped = curl_easy_unescape(curl, comma + 1, 0, &templen);
c->datalen = templen;
if (unescaped == NULL) { if (unescaped == NULL) {
msg.type = FETCH_ERROR; msg.type = FETCH_ERROR;
msg.data.error = "Unable to URL decode data: URL"; msg.data.error = "Unable to URL decode data: URL";
@ -212,9 +210,8 @@ static bool fetch_data_process(struct fetch_data_context *c)
} }
if (c->base64) { if (c->base64) {
c->data = malloc(c->datalen); /* safe: always gets smaller */ base64_decode_alloc(unescaped, unescaped_len, &c->data, &c->datalen);
if (base64_decode(unescaped, c->datalen, c->data, if (c->data == NULL) {
&(c->datalen)) == false) {
msg.type = FETCH_ERROR; msg.type = FETCH_ERROR;
msg.data.error = "Unable to Base64 decode data: URL"; msg.data.error = "Unable to Base64 decode data: URL";
fetch_data_send_callback(&msg, c); fetch_data_send_callback(&msg, c);
@ -222,7 +219,7 @@ static bool fetch_data_process(struct fetch_data_context *c)
return false; return false;
} }
} else { } else {
c->data = malloc(c->datalen); c->data = malloc(unescaped_len);
if (c->data == NULL) { if (c->data == NULL) {
msg.type = FETCH_ERROR; msg.type = FETCH_ERROR;
msg.data.error = msg.data.error =
@ -231,7 +228,8 @@ static bool fetch_data_process(struct fetch_data_context *c)
curl_free(unescaped); curl_free(unescaped);
return false; return false;
} }
memcpy(c->data, unescaped, c->datalen); c->datalen = unescaped_len;
memcpy(c->data, unescaped, unescaped_len);
} }
curl_free(unescaped); curl_free(unescaped);