Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=d4ebd7253a2393e430f813ea24f1b2a06ec29a0a
commit d4ebd7253a2393e430f813ea24f1b2a06ec29a0a Author: Baste <[email protected]> Date: Mon Mar 26 19:57:50 2012 +0200 libgnomekbd-3.4.0.1-3-x86_64 * fix-segfault libgnomekbd diff --git a/source/gnome/libgnomekbd/0001-config-fix-segfault-in-gkbd_keyboard_config_options_.patch b/source/gnome/libgnomekbd/0001-config-fix-segfault-in-gkbd_keyboard_config_options_.patch new file mode 100644 index 0000000..9566c27 --- /dev/null +++ b/source/gnome/libgnomekbd/0001-config-fix-segfault-in-gkbd_keyboard_config_options_.patch @@ -0,0 +1,36 @@ +From fa7b03f89c535a95173ac1b0b75e9bc48a85e78a Mon Sep 17 00:00:00 2001 +From: Olivier Blin <[email protected]> +Date: Mon, 26 Mar 2012 14:19:20 +0200 +Subject: [PATCH] config: fix segfault in gkbd_keyboard_config_options_equals + (#672848) + +static arrays were passed to free() +--- + libgnomekbd/gkbd-keyboard-config.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c +index 8ae216b..2f15a42 100644 +--- a/libgnomekbd/gkbd-keyboard-config.c ++++ b/libgnomekbd/gkbd-keyboard-config.c +@@ -526,18 +526,12 @@ gkbd_keyboard_config_options_equals (GkbdKeyboardConfig * kbd_config1, + if (!gkbd_keyboard_config_split_items (kbd_config1->options[i], &group1, &option1)) + continue; + +- g_free (group1); +- + for (j = 0; j < num_options && !are_equal; j++) { + if (gkbd_keyboard_config_split_items (kbd_config2->options[j], &group2, &option2)) { + are_equal = strcmp (option1, option2) == 0; +- g_free (group2); +- g_free (option2); + } + } + +- g_free (option1); +- + if (!are_equal) + return False; + } +-- +1.7.9.3 diff --git a/source/gnome/libgnomekbd/FrugalBuild b/source/gnome/libgnomekbd/FrugalBuild index eb32102..15d1fec 100644 --- a/source/gnome/libgnomekbd/FrugalBuild +++ b/source/gnome/libgnomekbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libgnomekbd pkgver=3.4.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Keyboard library for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'dbus-glib>=0.76' 'gtk+3' 'libxklavier>=5.0') @@ -13,7 +13,9 @@ archs=('i686' 'x86_64') _F_gnome_glib="y" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet -sha1sums=('8ecf03afe65740b75abfa5a4b48434df180ef8f3') +source=($source 0001-config-fix-segfault-in-gkbd_keyboard_config_options_.patch) +sha1sums=('8ecf03afe65740b75abfa5a4b48434df180ef8f3' \ + 'e06842b978c0ab459ee67ff1175883bf9327aa81') Fconfopts="$Fconfopts --disable-static \ --disable-compile-warnings \ --enable-introspection" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
