diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
| commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
| tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /extra/libgnome-keyring | |
| parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
| parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'extra/libgnome-keyring')
| -rw-r--r-- | extra/libgnome-keyring/fix_crash.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch deleted file mode 100644 index 1e28cdb73..000000000 --- a/extra/libgnome-keyring/fix_crash.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Mon, 23 May 2011 08:58:49 +0000 -Subject: Fix crash from recent memleak fix (b49e32b) - -make_attribute_list_va() statically copies the caller's method arguments into -the GnomeKeyringAttributeList, so we must only free the array itself, not the -GnomeKeyringAttribute strings. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840 ---- -diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c -index dc271dd..4febf47 100644 ---- a/library/gnome-keyring.c -+++ b/library/gnome-keyring.c -@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type, - va_end (args); - - ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data); -- gnome_keyring_attribute_list_free (attributes); -+ g_array_free (attributes, TRUE); - return ret; - } - -@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type, - va_end (args); - - ret = gnome_keyring_find_items_sync (type, attributes, found); -- gnome_keyring_attribute_list_free (attributes); -+ g_array_free (attributes, TRUE); - return ret; - } - --- -cgit v0.9 |