From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Perez de Castro Date: Tue, 18 Feb 2020 16:08:57 +0200 Subject: [Buildroot] [PATCH 1/1] package/cog: add patch fixing cog segfault In-Reply-To: <20200218084339.21371-1-james.hilliard1@gmail.com> References: <20200218084339.21371-1-james.hilliard1@gmail.com> Message-ID: <20200218160857.GC245372@momiji> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On Tue, 18 Feb 2020 01:43:39 -0700, James Hilliard wrote: > 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 at entry=0, latched_group=latched_group at entry=0, locked_group=0) at ../src/state.c:814 > 814 prev_components = state->components; > > Signed-off-by: James Hilliard Acked-by: Adrian Perez de Castro > --- > ...ata.state-is-not-null-before-calling.patch | 30 +++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch > > diff --git a/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch b/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch > new file mode 100644 > index 0000000000..4e8d4ad121 > --- /dev/null > +++ b/package/cog/0001-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch > @@ -0,0 +1,30 @@ > +From 9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4 Mon Sep 17 00:00:00 2001 > +From: James Hilliard > +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 at gmail.com: backport from upstream commit > +9f1f1e64b65e6680d5cdedf5a3b753ef85fc01f4] > +Signed-off-by: James Hilliard > +--- > + 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 > + > -- > 2.20.1 > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: