Commit 95e29079788a376c4b02d6c7f06ad8b447f3f935
2021-03-18T12:22:34
xkbcomp: plug a potential memory leak libxkbcommon-1.0.3/src/xkbcomp/ast-build.c:526: leaked_storage: Variable "file" going out of scope leaks the storage it points to. Where we exit the loop early, we don't release the various allocated memory. Make this patch more obvious my moving the declaration for those into the loop as well, this way we know that they aren't used outside the loop anywhere. Found by coverity Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/src/xkbcomp/ast-build.c b/src/xkbcomp/ast-build.c
index 7ee13d0..347eed8 100644
--- a/src/xkbcomp/ast-build.c
+++ b/src/xkbcomp/ast-build.c
@@ -462,15 +462,16 @@ IncludeStmt *
IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge)
{
IncludeStmt *incl, *first;
- char *file, *map, *stmt, *tmp, *extra_data;
+ char *stmt, *tmp;
char nextop;
incl = first = NULL;
- file = map = NULL;
tmp = str;
stmt = strdup_safe(str);
while (tmp && *tmp)
{
+ char *file = NULL, *map = NULL, *extra_data = NULL;
+
if (!ParseIncludeMap(&tmp, &file, &map, &nextop, &extra_data))
goto err;
@@ -494,8 +495,12 @@ IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge)
incl = incl->next_incl;
}
- if (!incl)
+ if (!incl) {
+ free(file);
+ free(map);
+ free(extra_data);
break;
+ }
incl->common.type = STMT_INCLUDE;
incl->common.next = NULL;