From 358127a145071952dccb9d7dc7c2f6489cc81269 Mon Sep 17 00:00:00 2001 From: William Bell Date: Thu, 26 Jun 2025 18:08:17 +0100 Subject: [PATCH] fix memory leak in operations --- null_test.ar | 2 +- src/parser/declaration/declaration.c | 4 +++- src/parser/operations/operations.c | 22 +++++++++++++--------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/null_test.ar b/null_test.ar index 57cad2c..c156d2e 100644 --- a/null_test.ar +++ b/null_test.ar @@ -1 +1 @@ -let f(x)="bruh" \ No newline at end of file +let x(hello,lol,world, WORLD,HELLOOOO,LOLLLLLL, WORLD)=let f(x)="bruh" \ No newline at end of file diff --git a/src/parser/declaration/declaration.c b/src/parser/declaration/declaration.c index abd7c53..890917e 100644 --- a/src/parser/declaration/declaration.c +++ b/src/parser/declaration/declaration.c @@ -23,6 +23,7 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) { darray_push(declarations, &_declaration); ParsedSingleDeclaration *declaration = darray_get(declarations, declarations->size - 1); + bool isFunction=false; DArray parameters; declaration->from = parse_null(); @@ -39,6 +40,7 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) { return parsedValue; token = darray_get(tokens, *index); if (token->type == TOKEN_LPAREN) { + isFunction = true; darray_init(¶meters, sizeof(char *)); (*index)++; error_if_finished(file, tokens, index); @@ -98,7 +100,7 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) { exit(EXIT_FAILURE); } } - if (parameters.resizable) { + if (isFunction) { declaration->from = create_parsed_function(declaration->name, parameters, declaration->from); } diff --git a/src/parser/operations/operations.c b/src/parser/operations/operations.c index 677b9fd..a50db4b 100644 --- a/src/parser/operations/operations.c +++ b/src/parser/operations/operations.c @@ -6,9 +6,9 @@ #include #include -ParsedValue *convert_to_operation(DArray *to_operate_on, DArray *operations) { +ParsedValue convert_to_operation(DArray *to_operate_on, DArray *operations) { if (to_operate_on->size == 1) { - return darray_get(to_operate_on, 0); + return *((ParsedValue*)darray_get(to_operate_on, 0)); } TokenType operation = 0; DArray positions; @@ -23,10 +23,10 @@ ParsedValue *convert_to_operation(DArray *to_operate_on, DArray *operations) { } darray_push(&positions, &i); } - ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue)); - parsedValue->type = AST_OPERATION; + ParsedValue parsedValue; + parsedValue.type = AST_OPERATION; ParsedOperation *operationStruct = checked_malloc(sizeof(ParsedOperation)); - parsedValue->data = operationStruct; + parsedValue.data = operationStruct; operationStruct->operation = operation; darray_init(&operationStruct->to_operate_on, sizeof(ParsedValue)); size_t last_position = 0; @@ -37,16 +37,18 @@ ParsedValue *convert_to_operation(DArray *to_operate_on, DArray *operations) { to_operate_on, to_operate_on_last_position, (*position) + 1); DArray operations_slice = darray_slice(operations, last_position, *position); + ParsedValue result = convert_to_operation(&to_operate_on_slice, &operations_slice); darray_push(&operationStruct->to_operate_on, - convert_to_operation(&to_operate_on_slice, &operations_slice)); + &result); last_position = (*position); to_operate_on_last_position = (*position) + 1; } DArray to_operate_on_slice = darray_slice(to_operate_on, to_operate_on_last_position, to_operate_on->size); DArray operations_slice = darray_slice(operations, last_position, operations->size); + ParsedValue result =convert_to_operation(&to_operate_on_slice, &operations_slice); darray_push(&operationStruct->to_operate_on, - convert_to_operation(&to_operate_on_slice, &operations_slice)); + &result); darray_free(&positions, NULL); return parsedValue; } @@ -80,10 +82,12 @@ ParsedValue *parse_operations(char *file, DArray *tokens, size_t *index, darray_push(&to_operate_on, parsedValue); free(parsedValue); } - ParsedValue *output = convert_to_operation(&to_operate_on, &operations); + ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue)); + ParsedValue output = convert_to_operation(&to_operate_on, &operations); + memcpy(parsedValue, &output,sizeof(ParsedValue)); darray_free(&to_operate_on, NULL); darray_free(&operations, NULL); - return output; + return parsedValue; } void free_operation(void *ptr) {