NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/cog: add patch fixing cog segfault

Browse Source 
Fixes:
Thread 1 "cog" received signal SIGSEGV, Segmentation fault.
xkb_state_update_mask (state=0x0, base_mods=0, latched_mods=0, locked_mods=0, base_group=base_group@entry=0, latched_group=latched_group@entry=0, locked_group=0) at ../src/state.c:814
814	    prev_components = state->components;

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Acked-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
James Hilliard 2020-02-18 01:43:39 -07:00 committed by Thomas Petazzoni
parent 48802015a9
commit 285e54cfde
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch Normal file
View File

@ -0,0 +1,30 @@
From 9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4 Mon Sep 17 00:00:00 2001
From: James Hilliard <james.hilliard1@gmail.com>
Date: Tue, 18 Feb 2020 01:20:50 -0700
Subject: [PATCH] fdo: ensure xkb_data.state is not null before calling
xkb_state_update_mask (#180)
[james.hilliard1@gmail.com: backport from upstream commit
9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4]
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
platform/cog-platform-fdo.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c
index 36177fc..e6f1cb5 100644
--- a/platform/cog-platform-fdo.c
+++ b/platform/cog-platform-fdo.c
@@ -894,6 +894,9 @@ keyboard_on_modifiers (void *data,
uint32_t mods_locked,
uint32_t group)
{
+ if (xkb_data.state == NULL)
+ return;
+
xkb_state_update_mask (xkb_data.state,
mods_depressed,
mods_latched,
--
2.20.1