Re: Bug#872953: stretch-pu: package at-spi2-core/2.22.0-6
Control: tag -1 d-i
On Tue, Aug 22, 2017 at 22:43:25 +0200, Samuel Thibault wrote:
> Blind users have reported that their screen reader, Orca, would
> sometimes crash when switching from window to window (Bug#872912),
> affecting both stable and testing. Upstream released a fix, which was
> confirmed by Bug#872912 tester to completely fix the issue in sid. I
> would thus like to upload the fix to stable, as attached diff shows.
>
Looks fine to me, though should get a kibi-ack due to building a udeb.
Cyril, please tag this either confirmed or moreinfo when you have a
chance.
Cheers,
Julien
> commit acbc35d8089e0ad597fd4f22b8c745d87ebe33e8
> Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
> Date: Tue Aug 22 21:07:39 2017 +0200
>
> Upstream fix for crash on switching between windows
>
> patches/accessible_get_parent.diff (Closes: Bug#872912).
>
> diff --git a/debian/changelog b/debian/changelog
> index 5e0b720..0252734 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,10 @@
> +at-spi2-core (2.22.0-6+deb9u1) stretch; urgency=medium
> +
> + * patches/accessible_get_parent.diff: Upstream fix for crash on switching
> + between windows (Closes: Bug#872912).
> +
> + -- Samuel Thibault <sthibault@debian.org> Thu, 10 Aug 2017 21:20:02 +0200
> +
> at-spi2-core (2.22.0-6) unstable; urgency=medium
>
> * patches/git-329ef2c4ebcb3aec6dcfcac15357fd583a60c969:
> diff --git a/debian/patches/accessible_get_parent.diff b/debian/patches/accessible_get_parent.diff
> new file mode 100644
> index 0000000..5c1d035
> --- /dev/null
> +++ b/debian/patches/accessible_get_parent.diff
> @@ -0,0 +1,30 @@
> +commit 2347dad97cd903f6b7fed5a56b738e9ecdf80cac
> +Author: Mike Gorse <mgorse@suse.com>
> +Date: Mon May 8 18:59:40 2017 -0500
> +
> + atspi_accessible_get_parent: move check for NULL AtspiApplication object
> +
> + Now, if we don't have a cached parent, then we always either return NULL
> + or make a D-Bus call. This might make the code more robust, and hoping
> + that it will fix https://bugzilla.gnome.org/show_bug.cgi?id=767074,
> + though in theory it should make no difference there.
> +
> +diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
> +index 4547ef7..b84317f 100644
> +--- a/atspi/atspi-accessible.c
> ++++ b/atspi/atspi-accessible.c
> +@@ -268,11 +268,12 @@ atspi_accessible_get_parent (AtspiAccessible *obj, GError **error)
> + {
> + g_return_val_if_fail (obj != NULL, NULL);
> +
> +- if (obj->parent.app &&
> +- !_atspi_accessible_test_cache (obj, ATSPI_CACHE_PARENT))
> ++ if (!_atspi_accessible_test_cache (obj, ATSPI_CACHE_PARENT))
> + {
> + DBusMessage *message, *reply;
> + DBusMessageIter iter, iter_variant;
> ++ if (!obj->parent.app)
> ++ return NULL;
> + message = dbus_message_new_method_call (obj->parent.app->bus_name,
> + obj->parent.path,
> + DBUS_INTERFACE_PROPERTIES, "Get");
> diff --git a/debian/patches/series b/debian/patches/series
> index 266c41a..eb8e71a 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -3,3 +3,4 @@ revert-register-late
> register-client-not-too-early
> git-329ef2c4ebcb3aec6dcfcac15357fd583a60c969
> git-eba079f3e72e61e6b55d81727ab50c85d505d296
> +accessible_get_parent.diff
Reply to: