From f34eabd55afafde2faf5174a7a48812c923596db Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 5 May 2019 08:20:22 +0200 Subject: [PATCH] Fixed partial send data offset and memory leak --- app/src/main/jni/netguard/tcp.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/main/jni/netguard/tcp.c b/app/src/main/jni/netguard/tcp.c index 414e893b..65d27598 100644 --- a/app/src/main/jni/netguard/tcp.c +++ b/app/src/main/jni/netguard/tcp.c @@ -485,20 +485,26 @@ void check_tcp_socket(const struct arguments *args, fwd = 1; buffer_size -= sent; s->tcp.sent += sent; - s->tcp.forward->seq += sent; - s->tcp.forward->len -= sent; - s->tcp.remote_seq = s->tcp.forward->seq; + s->tcp.remote_seq = s->tcp.forward->seq + sent; - if (s->tcp.forward->len == 0) { - struct segment *p = s->tcp.forward; - s->tcp.forward = s->tcp.forward->next; - free(p->data); - free(p); - } else { + if (sent != s->tcp.forward->len) { log_android(ANDROID_LOG_WARN, "%s partial send %u/%u", session, sent, s->tcp.forward->len); - break; + + struct segment *n = malloc(sizeof(struct segment)); + n->seq = s->tcp.forward->seq + sent; + n->len = s->tcp.forward->len - (uint16_t) sent; + n->data = malloc(n->len); + memcpy(n->data, s->tcp.forward->data + sent, n->len); + n->psh = s->tcp.forward->psh; + n->next = s->tcp.forward->next; + s->tcp.forward->next = n; } + + struct segment *p = s->tcp.forward; + s->tcp.forward = s->tcp.forward->next; + free(p->data); + free(p); } }