summaryrefslogtreecommitdiff
path: root/www/galeon2
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-11-05 05:04:16 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-11-05 05:04:16 +0000
commitcb275c7acb86c3afa0da29147a85db828fd047c5 (patch)
tree1f545ab1e501de329c872ffe8954e72aaf203a0d /www/galeon2
parentFix grammar. (diff)
Don't reference memory after free'ing it. This fixes a lockup and possible
crash when exiting Galeon. Reported by: Simon Barner <barner@in.tum.de>
Notes
Notes: svn path=/head/; revision=93121
Diffstat (limited to 'www/galeon2')
-rw-r--r--www/galeon2/Makefile1
-rw-r--r--www/galeon2/files/patch-src_galeon-shell.c22
2 files changed, 21 insertions, 2 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 97b9730916ea..3925ef83003b 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= galeon2
PORTVERSION= 1.3.10
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
diff --git a/www/galeon2/files/patch-src_galeon-shell.c b/www/galeon2/files/patch-src_galeon-shell.c
index cf363fdf36ec..bb5bd9d153d0 100644
--- a/www/galeon2/files/patch-src_galeon-shell.c
+++ b/www/galeon2/files/patch-src_galeon-shell.c
@@ -1,5 +1,5 @@
---- src/galeon-shell.c.orig Tue Oct 28 01:07:00 2003
-+++ src/galeon-shell.c Tue Oct 28 01:09:34 2003
+--- src/galeon-shell.c.orig Mon Oct 13 17:56:13 2003
++++ src/galeon-shell.c Tue Nov 4 23:07:54 2003
@@ -186,6 +186,7 @@
if (gs->priv->automation_factory == NULL)
{
@@ -17,3 +17,21 @@
"<tt>\"GNOME_Galeon_Automation.server\"</tt>");
hig_alert_set_secondary_printf (HIG_ALERT (dialog), "%s\n\n%s", text,
_("Usually this is an indication of an incomplete installation. "
+@@ -283,8 +284,6 @@
+ gb_bookmark_set_check_save (gs->priv->bookmark_set);
+ g_object_unref (G_OBJECT (gs->priv->bookmark_set));
+
+- g_free (gs->priv);
+-
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+
+ #ifdef DEBUG_MARCO
+@@ -295,6 +294,8 @@
+ {
+ bonobo_object_unref (gs->priv->automation_factory);
+ }
++
++ g_free (gs->priv);
+
+ bonobo_main_quit ();
+