From 43d6412322cae11847fd57dd1ea0985e646f29a3 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Tue, 4 Mar 2014 22:14:57 +0000 Subject: [PATCH 1/2] Fix for a server-crashing issue in libnudge. Signed-off-by: Mloc-Argent --- lib/src/nudge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/src/nudge.c b/lib/src/nudge.c index 90aa85fb5ec..a71e7665545 100644 --- a/lib/src/nudge.c +++ b/lib/src/nudge.c @@ -47,11 +47,11 @@ DLL_EXPORT const char * nudge(int n, char *v[]) { return ""; } - + size_t out_c = san_c(v[0]) + san_c(v[2]) + san_c(v[3]); char * san_out = malloc(out_c + 56); - + char * san_i = san_out; strcpy(san_i, "(dp1\nS'ip'\np2\nS'"); san_i += 16; @@ -67,7 +67,9 @@ DLL_EXPORT const char * nudge(int n, char *v[]) socket_t nudge_sock = connect_sock(v[1], "45678"); send_n(nudge_sock, san_out, out_c + 56); close_socket(nudge_sock); - + + free(san_out); + return "1"; } From 5c8fddcad087f49ea2bbb3bfa2345d42e2856936 Mon Sep 17 00:00:00 2001 From: Mloc Date: Wed, 5 Mar 2014 12:37:11 +0000 Subject: [PATCH 2/2] fuck --- lib/src/nudge.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/src/nudge.c b/lib/src/nudge.c index a71e7665545..d9efb90b73f 100644 --- a/lib/src/nudge.c +++ b/lib/src/nudge.c @@ -1,4 +1,3 @@ -#include #include #include @@ -50,7 +49,7 @@ DLL_EXPORT const char * nudge(int n, char *v[]) size_t out_c = san_c(v[0]) + san_c(v[2]) + san_c(v[3]); - char * san_out = malloc(out_c + 56); + char * san_out = malloc(out_c + 57); char * san_i = san_out; strcpy(san_i, "(dp1\nS'ip'\np2\nS'");