From 8a24646c49a27457e5147b5438a2c8b41d6e672a Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Fri, 8 Dec 2017 00:30:30 +0100 Subject: [PATCH] Potentially breaking change, free old strings --- rsudo.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/rsudo.c b/rsudo.c index 041039e..2670a18 100644 --- a/rsudo.c +++ b/rsudo.c @@ -40,13 +40,14 @@ struct header_s { int op; }; -char *join(const char *s1, const char *s2) { - free((void *)s1); +char *join(char *s1, char *s2) { char *result = malloc(strlen(s1) + strlen(s2) + 1); if (result) { strcpy(result, s1); strcat(result, s2); } + free(s1); + free(s2); return result; } @@ -110,17 +111,6 @@ int main(int argc, char **argv) { exit(-1); } - /* - - if(strlen(buffer) != header.len || strlen(buffer) - 1 != header.len) - { - printf("%u %d\n", strlen(buffer), header.len); - LOG_ERROR("main", "hello length != header length"); - exit(-1); - } - - */ - if (header.op != 0) { LOG_ERROR("main", "incorrect header op"); exit(-1);