| Message ID | 20240501-xkb-v1-1-f046d8e11a2b@daynix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qemu-keymap: Free xkb allocations | expand |
01.05.2024 10:55, Akihiko Odaki wrote: > This fixes LeakSanitizer complaints with xkbcommon 1.6.0. > > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > qemu-keymap.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/qemu-keymap.c b/qemu-keymap.c > index 8c80f7a4ed65..7a9f38cf9863 100644 > --- a/qemu-keymap.c > +++ b/qemu-keymap.c > @@ -237,6 +237,9 @@ int main(int argc, char *argv[]) > xkb_state_unref(state); > state = NULL; > > + xkb_keymap_unref(map); > + xkb_context_unref(ctx); > + I'd avoid freeing any resources in main() entirely, since it's much cheaper to free whole process by the kernel at exit time than to mess with each chunk of allocated memory. Dunno how useful it is to "fix" these. /mjt > /* add quirks */ > fprintf(outfile, > "\n" > > --- > base-commit: c25df57ae8f9fe1c72eee2dab37d76d904ac382e > change-id: 20240501-xkb-258483ccc5d8 > > Best regards,
On 2024/05/05 19:24, Michael Tokarev wrote: > 01.05.2024 10:55, Akihiko Odaki wrote: >> This fixes LeakSanitizer complaints with xkbcommon 1.6.0. >> >> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> >> --- >> qemu-keymap.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/qemu-keymap.c b/qemu-keymap.c >> index 8c80f7a4ed65..7a9f38cf9863 100644 >> --- a/qemu-keymap.c >> +++ b/qemu-keymap.c >> @@ -237,6 +237,9 @@ int main(int argc, char *argv[]) >> xkb_state_unref(state); >> state = NULL; >> + xkb_keymap_unref(map); >> + xkb_context_unref(ctx); >> + > > I'd avoid freeing any resources in main() entirely, > since it's much cheaper to free whole process by the > kernel at exit time than to mess with each chunk of > allocated memory. Dunno how useful it is to "fix" > these. > > /mjt This is purely to satisfy LeakSanitizier; the LeakSanitizer complaints result in a build failure with many noisy logs. I don't add Fixes: tags for this kind of leaks. Regards, Akihiko Odaki
diff --git a/qemu-keymap.c b/qemu-keymap.c index 8c80f7a4ed65..7a9f38cf9863 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -237,6 +237,9 @@ int main(int argc, char *argv[]) xkb_state_unref(state); state = NULL; + xkb_keymap_unref(map); + xkb_context_unref(ctx); + /* add quirks */ fprintf(outfile, "\n"
This fixes LeakSanitizer complaints with xkbcommon 1.6.0. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- qemu-keymap.c | 3 +++ 1 file changed, 3 insertions(+) --- base-commit: c25df57ae8f9fe1c72eee2dab37d76d904ac382e change-id: 20240501-xkb-258483ccc5d8 Best regards,