From f50ed10b8c764e17158172ecc1b92de9239d173e Mon Sep 17 00:00:00 2001 From: Mazet Laurent Date: Thu, 2 Feb 2023 01:02:58 +0100 Subject: [PATCH] correct a memory leak --- parser.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/parser.c b/parser.c index 0359234..e1e7926 100644 --- a/parser.c +++ b/parser.c @@ -83,9 +83,7 @@ void delelement (element_t *root) if ((root != NULL) && (root != ERROR_OP)) { int i; for (i = 0; i < root->nbops; i++) { - if ((root->ops[i] != NULL) && (root->ops[i] != ERROR_OP)) { - delelement (root->ops[i]); - } + delelement (root->ops[i]); } if (root->nbops) { free (root->ops); @@ -241,10 +239,7 @@ element_t *parser (char *str, char **next, int prio) delelement (root); return ERROR_OP; } - element_t **prog = NULL; - new = newelement (Code, 0, 5); - root = new; - prog = &root; + root = newelement (Code, 0, 5); do { new = parser (str + 1, &str, 0); @@ -256,14 +251,14 @@ element_t *parser (char *str, char **next, int prio) delelement (root); return ERROR_OP; } - element_t *newprog = newelement (Code, (*prog)->nbops + 1, 5); - for (i = 0; i < (*prog)->nbops; i++) { - newprog->ops[i] = (*prog)->ops[i]; - (*prog)->ops[i] = NULL; + element_t *newprog = newelement (Code, root->nbops + 1, 5); + for (i = 0; i < root->nbops; i++) { + newprog->ops[i] = root->ops[i]; + root->ops[i] = NULL; } - newprog->ops[(*prog)->nbops] = new; - delelement (*prog); - (*prog) = newprog; + newprog->ops[root->nbops] = new; + delelement (root); + root = newprog; } while (*str == ','); if (*str != '}') { @@ -700,7 +695,6 @@ double execute_code (element_t **prog, int nbcalls) int i; for (i = 0; i < nbcalls; i++) { ret = evaluate_element (prog[i], 0); - prog[i] = NULL; } return ret; } -- 2.30.2