diff options
| author | Richard Purdie <richard@ted.(none)> | 2009-06-04 19:38:05 +0100 |
|---|---|---|
| committer | Richard Purdie <richard@ted.(none)> | 2009-06-04 19:38:05 +0100 |
| commit | ae950c85d79acbaa03f8fbb0df067b22d0766623 (patch) | |
| tree | 56c08089c4937ec82f141f7a98236c4dbfe95d9a | |
| parent | 0223f45de06c35c4f83e4f3a09e96a84f916f99d (diff) | |
| download | openembedded-core-ae950c85d79acbaa03f8fbb0df067b22d0766623.tar.gz openembedded-core-ae950c85d79acbaa03f8fbb0df067b22d0766623.tar.bz2 openembedded-core-ae950c85d79acbaa03f8fbb0df067b22d0766623.zip | |
gtk+: Fix a string referencing bug (path sent upstream)
Signed-off-by: Richard Purdie <richard@ted.(none)>
| -rw-r--r-- | meta/packages/gtk+/gtk+-2.14.2/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch | 31 | ||||
| -rw-r--r-- | meta/packages/gtk+/gtk+_2.14.2.bb | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/packages/gtk+/gtk+-2.14.2/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/packages/gtk+/gtk+-2.14.2/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch new file mode 100644 index 0000000000..e0d6ab9522 --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.14.2/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch @@ -0,0 +1,31 @@ +From 69b9441eab2a7215509687dc22b48b6f212d22aa Mon Sep 17 00:00:00 2001 +From: Rob Bradford <rob@linux.intel.com> +Date: Thu, 4 Jun 2009 15:43:20 +0100 +Subject: [PATCH] =?utf-8?q?bgo#584832=20=E2=80=93=20Duplicate=20the=20exec=20string=20returned=20by=20gtk=5Frecent=5Finfo=5Fget=5Fapplication=5Finfo?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +This function states that the caller is responsible for freeing the string +passed returned by reference. Unfortunately if you do this you get a crash +since the internal value is returned without being duplicated. +--- + gtk/gtkrecentmanager.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c +index 317b3d5..d062572 100644 +--- a/gtk/gtkrecentmanager.c ++++ b/gtk/gtkrecentmanager.c +@@ -1764,7 +1764,7 @@ gtk_recent_info_get_application_info (GtkRecentInfo *info, + } + + if (app_exec) +- *app_exec = ai->exec; ++ *app_exec = g_strdup (ai->exec); + + if (count) + *count = ai->count; +-- +1.6.3.1 + diff --git a/meta/packages/gtk+/gtk+_2.14.2.bb b/meta/packages/gtk+/gtk+_2.14.2.bb index f5190c5849..494355cd7a 100644 --- a/meta/packages/gtk+/gtk+_2.14.2.bb +++ b/meta/packages/gtk+/gtk+_2.14.2.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r2" +PR = "r3" SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.14/gtk+-${PV}.tar.bz2 \ file://cellrenderer-cairo.patch;patch=1;pnum=0 \ file://entry-cairo.patch;patch=1;pnum=0 \ file://toggle-font.diff;patch=1;pnum=0 \ + file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \ # TO MERGE # file://filesystem-volumes.patch;patch=1 \ # file://filechooser-props.patch;patch=1 \ |