diff --git a/.at-spi2-core.metadata b/.at-spi2-core.metadata index 2d2b903..217647a 100644 --- a/.at-spi2-core.metadata +++ b/.at-spi2-core.metadata @@ -1 +1 @@ -323b9b2332d50ceea999d33c10eb2fedc26b4c40 SOURCES/at-spi2-core-2.8.0.tar.xz +95d41898b4f7e84bdf5377a37ed65bf4c4a808e9 SOURCES/at-spi2-core-2.14.1.tar.xz diff --git a/.gitignore b/.gitignore index 7fd9d21..0dbfacd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/at-spi2-core-2.8.0.tar.xz +SOURCES/at-spi2-core-2.14.1.tar.xz diff --git a/SOURCES/0001-Don-t-crash-when-trying-to-set-an-invalid-state.patch b/SOURCES/0001-Don-t-crash-when-trying-to-set-an-invalid-state.patch new file mode 100644 index 0000000..18cf280 --- /dev/null +++ b/SOURCES/0001-Don-t-crash-when-trying-to-set-an-invalid-state.patch @@ -0,0 +1,33 @@ +From b8a13c0aa01a1ee37f55a0e111d0b9681cb60deb Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Sat, 14 Nov 2015 09:06:45 -0600 +Subject: [PATCH 1/4] Don't crash when trying to set an invalid state + +https://bugzilla.gnome.org/show_bug.cgi?id=757915 +--- + atspi/atspi-stateset.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/atspi/atspi-stateset.c b/atspi/atspi-stateset.c +index 1f9d993..366c48b 100644 +--- a/atspi/atspi-stateset.c ++++ b/atspi/atspi-stateset.c +@@ -102,11 +102,11 @@ atspi_state_set_set_by_name (AtspiStateSet *set, const gchar *name, gboolean ena + { + g_warning ("AT-SPI: Attempt to set unknown state '%s'", name); + } +- +- if (enabled) +- set->states |= ((gint64)1 << value->value); + else +- set->states &= ~((gint64)1 << value->value); ++ if (enabled) ++ set->states |= ((gint64)1 << value->value); ++ else ++ set->states &= ~((gint64)1 << value->value); + + g_type_class_unref (type_class); + } +-- +2.5.0 + diff --git a/SOURCES/0001-Fix-atspi_component_contains.patch b/SOURCES/0001-Fix-atspi_component_contains.patch deleted file mode 100644 index 3744302..0000000 --- a/SOURCES/0001-Fix-atspi_component_contains.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0bb46370f5ddf8e6273cd80d0047ea0b413a9c6 Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Wed, 23 Oct 2013 15:47:17 -0500 -Subject: [PATCH] Fix atspi_component_contains - -Per the spec, org.a11y.Atspi.Component.Contains takes a uint32 for the coord -type, not an int16 - -https://bugzilla.gnome.org/show_bug.cgi?id=710730 ---- - atspi/atspi-component.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atspi/atspi-component.c b/atspi/atspi-component.c -index 24d74d4..9cdd896 100644 ---- a/atspi/atspi-component.c -+++ b/atspi/atspi-component.c -@@ -84,7 +84,7 @@ atspi_component_contains (AtspiComponent *obj, - - g_return_val_if_fail (obj != NULL, FALSE); - -- _atspi_dbus_call (obj, atspi_interface_component, "Contains", error, "iin=>b", d_x, d_y, d_ctype, &retval); -+ _atspi_dbus_call (obj, atspi_interface_component, "Contains", error, "iiu=>b", d_x, d_y, d_ctype, &retval); - - return retval; - } --- -1.8.3.1 - diff --git a/SOURCES/0002-registryd-Avoid-crashing-with-a-NULL-keystring.patch b/SOURCES/0002-registryd-Avoid-crashing-with-a-NULL-keystring.patch new file mode 100644 index 0000000..25247cd --- /dev/null +++ b/SOURCES/0002-registryd-Avoid-crashing-with-a-NULL-keystring.patch @@ -0,0 +1,55 @@ +From 662a5454c127037627e8e5a7e3f2b5cbeb1c44f1 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Wed, 6 Apr 2016 16:40:44 +0200 +Subject: [PATCH 2/4] registryd: Avoid crashing with a NULL keystring + +From a coverity check: + +1. at-spi2-core-2.14.1/registryd/deviceeventcontroller-x11.c:1167: +deref_ptr_in_call: Dereferencing pointer "keystring". +2. at-spi2-core-2.14.1/registryd/deviceeventcontroller-x11.c:1169: +check_after_deref: Null-checking "keystring" suggests that it may be +null, but it has already been dereferenced on all paths leading to the +check. +(keystring, -1, &c))) { +--- + registryd/deviceeventcontroller-x11.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c +index d878d53..e003c00 100644 +--- a/registryd/deviceeventcontroller-x11.c ++++ b/registryd/deviceeventcontroller-x11.c +@@ -1164,8 +1164,6 @@ spi_dec_x11_synth_keystring (SpiDEController *controller, guint synth_type, gint + const gchar *c; + KeySym keysym; + +- maxlen = strlen (keystring) + 1; +- keysyms = g_new0 (KeySym, maxlen); + if (!(keystring && *keystring && g_utf8_validate (keystring, -1, &c))) { + retval = FALSE; + } +@@ -1173,6 +1171,9 @@ spi_dec_x11_synth_keystring (SpiDEController *controller, guint synth_type, gint + #ifdef SPI_DEBUG + fprintf (stderr, "[keystring synthesis attempted on %s]\n", keystring); + #endif ++ maxlen = strlen (keystring) + 1; ++ keysyms = g_new0 (KeySym, maxlen); ++ + while (keystring && (unichar = g_utf8_get_char (keystring))) { + char bytes[6]; + gint mbytes; +@@ -1206,8 +1207,9 @@ spi_dec_x11_synth_keystring (SpiDEController *controller, guint synth_type, gint + } + } + XSynchronize (spi_get_display (), FALSE); ++ ++ g_free (keysyms); + } +- g_free (keysyms); + + if (synth_type == Accessibility_KEY_SYM) { + keysym = keycode; +-- +2.5.0 + diff --git a/SOURCES/0003-Fix-atspi_table_cell_get_position.patch b/SOURCES/0003-Fix-atspi_table_cell_get_position.patch new file mode 100644 index 0000000..a5bddca --- /dev/null +++ b/SOURCES/0003-Fix-atspi_table_cell_get_position.patch @@ -0,0 +1,29 @@ +From 282c22945a9a0a8de4043939bfca208dd064d3ae Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Wed, 17 Jun 2015 20:22:05 -0500 +Subject: [PATCH 3/4] Fix atspi_table_cell_get_position + +--- + atspi/atspi-table-cell.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/atspi/atspi-table-cell.c b/atspi/atspi-table-cell.c +index 934fb19..104801e 100644 +--- a/atspi/atspi-table-cell.c ++++ b/atspi/atspi-table-cell.c +@@ -183,9 +183,9 @@ atspi_table_cell_get_position (AtspiTableCell *obj, + + g_return_val_if_fail (obj != NULL, -1); + +- reply = _atspi_dbus_call_partial (obj, "org.freedesktop.DBuss.Properties", +- "Get", atspi_interface_table_cell, +- "Position"); ++ reply = _atspi_dbus_call_partial (obj, "org.freedesktop.DBus.Properties", ++ "Get", NULL, "ss", ++ atspi_interface_table_cell, "Position"); + + dbus_message_iter_init (reply, &iter); + +-- +2.5.0 + diff --git a/SOURCES/0004-atspi-event-listener-Plug-a-memory-leak.patch b/SOURCES/0004-atspi-event-listener-Plug-a-memory-leak.patch new file mode 100644 index 0000000..65bc554 --- /dev/null +++ b/SOURCES/0004-atspi-event-listener-Plug-a-memory-leak.patch @@ -0,0 +1,26 @@ +From f73eedaf241aeca72ef1a1281b30380e5ef1ddd1 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Wed, 6 Apr 2016 17:10:03 +0200 +Subject: [PATCH 4/4] atspi-event-listener: Plug a memory leak + +--- + atspi/atspi-event-listener.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/atspi/atspi-event-listener.c b/atspi/atspi-event-listener.c +index 292e88b..3b51abe 100644 +--- a/atspi/atspi-event-listener.c ++++ b/atspi/atspi-event-listener.c +@@ -998,6 +998,9 @@ _atspi_dbus_handle_event (DBusConnection *bus, DBusMessage *message, void *data) + if (e.source == NULL) + { + g_warning ("Got no valid source accessible for signal for signal %s from interface %s\n", member, category); ++ g_free (converted_type); ++ g_free (name); ++ g_free (detail); + return DBUS_HANDLER_RESULT_HANDLED; + } + +-- +2.5.0 + diff --git a/SPECS/at-spi2-core.spec b/SPECS/at-spi2-core.spec index 1282d7d..8535c18 100644 --- a/SPECS/at-spi2-core.spec +++ b/SPECS/at-spi2-core.spec @@ -1,13 +1,17 @@ Name: at-spi2-core -Version: 2.8.0 -Release: 6%{?dist} +Version: 2.14.1 +Release: 2%{?dist} Summary: Protocol definitions and daemon for D-Bus at-spi Group: System Environment/Libraries License: LGPLv2+ URL: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus -Source0: http://download.gnome.org/sources/at-spi2-core/2.8/%{name}-%{version}.tar.xz -Patch0: 0001-Fix-atspi_component_contains.patch +Source0: http://download.gnome.org/sources/at-spi2-core/2.14/%{name}-%{version}.tar.xz + +Patch0: 0001-Don-t-crash-when-trying-to-set-an-invalid-state.patch +Patch1: 0002-registryd-Avoid-crashing-with-a-NULL-keystring.patch +Patch2: 0003-Fix-atspi_table_cell_get_position.patch +Patch3: 0004-atspi-event-listener-Plug-a-memory-leak.patch BuildRequires: dbus-devel BuildRequires: dbus-glib-devel @@ -35,7 +39,7 @@ ORBIT / CORBA for its transport protocol. %package devel Summary: Development files and headers for at-spi2-core Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The at-spi2-core-devel package includes the header files and @@ -44,6 +48,9 @@ API documentation for libatspi. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -v --install --force @@ -81,21 +88,96 @@ rm $RPM_BUILD_ROOT%{_libdir}/libatspi.la %{_libdir}/pkgconfig/atspi-2.pc %changelog -* Fri Jan 24 2014 Daniel Mach - 2.8.0-6 -- Mass rebuild 2014-01-24 +* Wed Apr 6 2016 Rui Matos - 2.14.1-2 +- Fixes for coverity scan issues + +* Mon Nov 10 2014 Kalev Lember - 2.14.1-1 +- Update to 2.14.1 + +* Mon Sep 22 2014 Kalev Lember - 2.14.0-1 +- Update to 2.14.0 + +* Tue Sep 16 2014 Kalev Lember - 2.13.92-1 +- Update to 2.13.92 + +* Tue Aug 19 2014 Kalev Lember - 2.13.90-1 +- Update to 2.13.90 + +* Fri Aug 15 2014 Fedora Release Engineering - 2.13.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 2.13.4-2 +- Rebuilt for gobject-introspection 1.41.4 + +* Sun Jul 20 2014 Kalev Lember - 2.13.4-1 +- Update to 2.13.4 + +* Sat Jun 07 2014 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Apr 29 2014 Richard Hughes - 2.13.1-1 +- Update to 2.13.1 + +* Sat Apr 05 2014 Kalev Lember - 2.12.0-2 +- Tighten -devel deps + +* Mon Mar 24 2014 Richard Hughes - 2.12.0-1 +- Update to 2.12.0 + +* Tue Mar 18 2014 Richard Hughes - 2.11.92-1 +- Update to 2.11.92 -* Fri Dec 27 2013 Daniel Mach - 2.8.0-5 -- Mass rebuild 2013-12-27 +* Tue Mar 04 2014 Richard Hughes - 2.11.91-1 +- Update to 2.11.91 -* Wed Oct 30 2013 Rui Matos - 2.8.0-4 -- Resolves: rhbz#1022934 atspi_component_contains uses incorrect method signature +* Wed Feb 19 2014 Richard Hughes - 2.11.90-1 +- Update to 2.11.90 -* Sun Jul 28 2013 Rui Matos - 2.8.0-3 +* Tue Feb 04 2014 Richard Hughes - 2.11.5-1 +- Update to 2.11.5 + +* Tue Dec 17 2013 Richard Hughes - 2.11.3-1 +- Update to 2.11.3 + +* Tue Nov 19 2013 Richard Hughes - 2.11.2-1 +- Update to 2.11.2 + +* Mon Nov 04 2013 Kalev Lember - 2.11.1-1 +- Update to 2.11.1 + +* Mon Oct 28 2013 Richard Hughes - 2.10.1-1 +- Update to 2.10.1 + +* Tue Sep 24 2013 Kalev Lember - 2.10.0-1 +- Update to 2.10.0 + +* Tue Sep 17 2013 Kalev Lember - 2.9.92-1 +- Update to 2.9.92 + +* Tue Sep 03 2013 Kalev Lember - 2.9.91-1 +- Update to 2.9.91 + +* Thu Aug 22 2013 Kalev Lember - 2.9.90-1 +- Update to 2.9.90 + +* Fri Aug 09 2013 Kalev Lember - 2.9.5-1 +- Update to 2.9.5 + +* Sun Jul 28 2013 Rui Matos - 2.9.4-3 - Pass --force to autoreconf to be sure it does what we want -* Sat Jul 20 2013 Rui Matos - 2.8.0-2 +* Sat Jul 20 2013 Rui Matos - 2.9.4-2 - Run autoreconf instead of a sed hack to avoid RPATH embedding +* Tue Jul 16 2013 Richard Hughes - 2.9.4-1 +- Update to 2.9.4 + +* Thu Jun 20 2013 Kalev Lember - 2.9.3-1 +- Update to 2.9.3 + +* Sun Jun 02 2013 Kalev Lember - 2.9.2-1 +- Update to 2.9.2 + * Mon Mar 25 2013 Kalev Lember - 2.8.0-1 - Update to 2.8.0