aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-29 03:17:53 -04:00
Code

[data] Small rewrite.

Browse Source
This commit is contained in:
Witold Filipczyk 2020-09-15 08:32:49 +02:00
parent 3d78cd1264
commit d731d5901d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/protocol/data.c
View File

@ -118,7 +118,8 @@ data_protocol_handler(struct connection *conn)
struct cache_entry *cached = get_cache_entry(uri); struct cache_entry *cached = get_cache_entry(uri);
unsigned char *data_start, *data; unsigned char *data_start, *data;
int base64 = 0; int base64 = 0;
int datalen = 0; int decodedlen = 0;
int datalen;
if (!cached) { if (!cached) {
abort_connection(conn, connection_state(S_OUT_OF_MEM)); abort_connection(conn, connection_state(S_OUT_OF_MEM));
@ -135,14 +136,15 @@ data_protocol_handler(struct connection *conn)
/* Allocate the data string because URI decoding will possibly modify /* Allocate the data string because URI decoding will possibly modify
* it. */ * it. */
data = memacpy(data_start, uri->datalen - (data_start - uri->data)); datalen = uri->datalen - (data_start - uri->data);
data = memacpy(data_start, datalen);
if (!data) { if (!data) {
abort_connection(conn, connection_state(S_OUT_OF_MEM)); abort_connection(conn, connection_state(S_OUT_OF_MEM));
return; return;
} }
if (base64) { if (base64) {
unsigned char *decoded = base64_decode_bin(data, strlen(data), &datalen); unsigned char *decoded = base64_decode_bin(data, datalen, &decodedlen);
if (!decoded) { if (!decoded) {
abort_connection(conn, connection_state(S_OUT_OF_MEM)); abort_connection(conn, connection_state(S_OUT_OF_MEM));
@ -152,16 +154,12 @@ data_protocol_handler(struct connection *conn)
mem_free_set(&data, decoded); mem_free_set(&data, decoded);
} else { } else {
decode_uri(data); decode_uri(data);
}
{
/* Use strlen() to get the correct decoded length */ /* Use strlen() to get the correct decoded length */
if (!datalen) datalen = strlen(data); decodedlen = strlen(data);
add_fragment(cached, conn->from, data, datalen);
conn->from += datalen;
} }
add_fragment(cached, conn->from, data, decodedlen);
conn->from += decodedlen;
mem_free(data); mem_free(data);
abort_connection(conn, connection_state(S_OK)); abort_connection(conn, connection_state(S_OK));