diff options
| author | marcus <marcus@FreeBSD.org> | 2007-01-19 02:21:47 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2007-01-19 02:21:47 +0800 |
| commit | 2508622eb74322a7a1b3697c087db4a1df2a8832 (patch) | |
| tree | 9b41fa4d3f8b35412e306dbc672ade37455336ba /x11-toolkits | |
| parent | ed5e31d529ed91dbc9179a23cdca91c7db7c1da1 (diff) | |
| download | freebsd-ports-gnome-2508622eb74322a7a1b3697c087db4a1df2a8832.tar.gz freebsd-ports-gnome-2508622eb74322a7a1b3697c087db4a1df2a8832.tar.zst freebsd-ports-gnome-2508622eb74322a7a1b3697c087db4a1df2a8832.zip | |
Fix a double free that could cause a crash in applications that make use
of the GTK+ recent items code.
Obtained from: GNOME SVN
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_gtkrecentchoosermenu.c | 21 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-gtk_gtkrecentchoosermenu.c | 21 |
4 files changed, 44 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 1a7e5ee99a4a..a7f0568c0d0d 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.10.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/v2.10/ \ diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkrecentchoosermenu.c b/x11-toolkits/gtk20/files/patch-gtk_gtkrecentchoosermenu.c new file mode 100644 index 000000000000..dd10610a2cc2 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkrecentchoosermenu.c @@ -0,0 +1,21 @@ +--- gtk/gtkrecentchoosermenu.c 2007/01/15 13:09:58 17157 ++++ gtk/gtkrecentchoosermenu.c 2007/01/17 12:30:18 17172 +@@ -941,6 +941,8 @@ + item = gtk_image_menu_item_new_with_label (text); + } + ++ g_free (text); ++ + label = GTK_BIN (item)->child; + if (label) + { +@@ -962,9 +964,6 @@ + G_CALLBACK (item_activate_cb), + menu); + +-out: +- g_free (label); +- + return item; + } + diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 1a7e5ee99a4a..a7f0568c0d0d 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.10.8 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/v2.10/ \ diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkrecentchoosermenu.c b/x11-toolkits/gtk30/files/patch-gtk_gtkrecentchoosermenu.c new file mode 100644 index 000000000000..dd10610a2cc2 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkrecentchoosermenu.c @@ -0,0 +1,21 @@ +--- gtk/gtkrecentchoosermenu.c 2007/01/15 13:09:58 17157 ++++ gtk/gtkrecentchoosermenu.c 2007/01/17 12:30:18 17172 +@@ -941,6 +941,8 @@ + item = gtk_image_menu_item_new_with_label (text); + } + ++ g_free (text); ++ + label = GTK_BIN (item)->child; + if (label) + { +@@ -962,9 +964,6 @@ + G_CALLBACK (item_activate_cb), + menu); + +-out: +- g_free (label); +- + return item; + } + |