diff options
| author | marcus <marcus@FreeBSD.org> | 2003-04-23 18:58:32 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-04-23 18:58:32 +0000 |
| commit | 93bff62606b496bb493b5b5c1d380aff335c7b62 (patch) | |
| tree | cd35f9fa0414ab47bd72a5a53962d87b3b10c5bb /deskutils | |
| parent | 3f90f0bb27dce59f538bbf9cfe318e8670ac70cf (diff) | |
| download | FreeBSD-ports-93bff62606b496bb493b5b5c1d380aff335c7b62.zip FreeBSD-ports-93bff62606b496bb493b5b5c1d380aff335c7b62.tar.gz | |
Fix a double-free bug in the logview application. This would be very bad
on non-FreeBSD systems, but phkmalloc should protect us. This fix should
take care of the abort crashes on -CURRENT.
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/gnome-utils/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/gnome-utils/files/patch-logview_logview.c | 18 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/files/patch-logview_logview.c | 18 |
4 files changed, 28 insertions, 10 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index f0ec120..e94c963 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeutils2 PORTVERSION= 2.2.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c index 49e8b06..3fe0abf 100644 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Tue May 7 00:03:16 2002 -+++ logview/logview.c Tue May 7 00:04:37 2002 -@@ -903,7 +903,7 @@ +--- logview/logview.c.orig Sun Feb 16 15:34:59 2003 ++++ logview/logview.c Wed Apr 23 14:51:26 2003 +@@ -774,7 +774,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -926,7 +926,7 @@ +@@ -797,7 +797,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -960,7 +960,7 @@ +@@ -831,7 +831,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -27,3 +27,11 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); +@@ -882,7 +882,6 @@ + else + prefs->logfile = NULL; + } +- g_free (logfile); + } + + void SaveUserPrefs(UserPrefsStruct *prefs) diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index f0ec120..e94c963 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomeutils2 PORTVERSION= 2.2.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 49e8b06..3fe0abf 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,6 +1,6 @@ ---- logview/logview.c.orig Tue May 7 00:03:16 2002 -+++ logview/logview.c Tue May 7 00:04:37 2002 -@@ -903,7 +903,7 @@ +--- logview/logview.c.orig Sun Feb 16 15:34:59 2003 ++++ logview/logview.c Wed Apr 23 14:51:26 2003 +@@ -774,7 +774,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -9,7 +9,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -926,7 +926,7 @@ +@@ -797,7 +797,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -18,7 +18,7 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -960,7 +960,7 @@ +@@ -831,7 +831,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), @@ -27,3 +27,11 @@ if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); +@@ -882,7 +882,6 @@ + else + prefs->logfile = NULL; + } +- g_free (logfile); + } + + void SaveUserPrefs(UserPrefsStruct *prefs) |
