From e4447f8131581b36262a833396c182faa950cf0c Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 3 Mar 2012 01:17:21 +0200 Subject: [PATCH] Fix other misc leaks Signed-off-by: Ran Benita --- src/xkbcomp/listing.c | 2 ++ src/xkbcomp/symbols.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/xkbcomp/listing.c b/src/xkbcomp/listing.c index 0fe8288..c0965c7 100644 --- a/src/xkbcomp/listing.c +++ b/src/xkbcomp/listing.c @@ -355,6 +355,8 @@ AddDirectory(CompPair *cp, char *head, char *ptrn, char *rest, char *map, } #ifdef WIN32 while (FindNextFile(dirh, &file)); +#else + closedir(dirp); #endif return nMatch; } diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index 95936ab..e452b14 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -349,6 +349,9 @@ MergeKeyGroups(SymbolsInfo * info, WSGO("Could not allocate actions for group merge\n"); ACTION("Group %d of key %s not merged\n", group, longText(into->name)); + if (resultSyms != into->syms[group] && + resultSyms != from->syms[group]) + free(resultSyms); return False; } } -- 2.7.4