fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 06:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-keymap-memory-leak' into 'main'

Browse source 
ply-keymap-icon: Fix memory leak

See merge request plymouth/plymouth!267
This commit is contained in:
Ray Strode 2023-12-22 14:50:08 +00:00
commit de600fd9a4
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/libply-splash-graphics/ply-keymap-icon.c
View file

@ -84,7 +84,7 @@ ply_keymap_icon_fill_keymap_info (ply_keymap_icon_t *keymap_icon)
{
const char *keymap_with_variant;
ply_renderer_t *renderer;
char *keymap, *compare_keymap;
char *keymap_without_variant;
int i;
keymap_icon->keymap_offset = -1;
@ -94,18 +94,19 @@ ply_keymap_icon_fill_keymap_info (ply_keymap_icon_t *keymap_icon)
if (!keymap_with_variant)
return;
keymap = ply_keymap_normalize_keymap (keymap_with_variant);
keymap_without_variant = ply_keymap_normalize_keymap (keymap_with_variant);
for (i = 0; ply_keymap_metadata[i].name; i++) {
const char *icon_text = NULL;
if (ply_keymap_metadata[i].type == PLY_LAYOUT_TERMINAL) {
compare_keymap = strdup (keymap);
icon_text = keymap_without_variant;
} else if (ply_keymap_metadata[i].type == PLY_LAYOUT_XKB) {
compare_keymap = strdup (keymap_with_variant);
icon_text = keymap_with_variant;
}
keymap_icon->keymap_name = compare_keymap;
if (strcmp (ply_keymap_metadata[i].name, compare_keymap) == 0) {
if (strcmp (ply_keymap_metadata[i].name, icon_text) == 0) {
keymap_icon->keymap_name = strdup (icon_text);
keymap_icon->keymap_offset = ply_keymap_metadata[i].offset;
keymap_icon->keymap_width = ply_keymap_metadata[i].width;
keymap_icon->has_prerendered_text = true;
@ -114,9 +115,9 @@ ply_keymap_icon_fill_keymap_info (ply_keymap_icon_t *keymap_icon)
}
if (keymap_icon->keymap_offset == -1)
ply_trace ("Warning: no pre-rendered text for '%s' keymap", keymap);
ply_trace ("Warning: no pre-rendered text for '%s' keymap", keymap_without_variant);
free (keymap);
free (keymap_without_variant);
}
ply_keymap_icon_t *