diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-01 02:07:35 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-01 02:07:35 +0800 |
| commit | 564e92be0fdfe8789b8d59f17b3020f1a6303daa (patch) | |
| tree | bfc18728e7e489e6a2e70a441112e4b2bec0f314 | |
| parent | 393f794e40fabc58af6169f1805611b707b36446 (diff) | |
| download | marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.tar marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.tar.gz marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.tar.bz2 marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.tar.lz marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.tar.xz marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.tar.zst marcuscom-ports-564e92be0fdfe8789b8d59f17b3020f1a6303daa.zip | |
Correct previous patch. Memory has to be freed after it's allocated.
There also seems to be a potential g_free(NULL) in the original code, so
correct that as well.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3026 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 9617f28e6..4b69a7ffb 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -7,7 +7,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 2.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c index 3b779ea13..3b8b07293 100644 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c @@ -1,5 +1,5 @@ ---- nautilus-cd-burner.c.orig Sun Sep 19 17:44:15 2004 -+++ nautilus-cd-burner.c Sun Oct 31 02:11:52 2004 +--- nautilus-cd-burner.c.orig Sun Sep 19 18:44:15 2004 ++++ nautilus-cd-burner.c Sun Oct 31 13:06:08 2004 @@ -21,6 +21,8 @@ Authors: Alexander Larsson <alexl@redhat.com> @@ -9,22 +9,25 @@ #include <gtk/gtk.h> #include <gtk/gtkfilesel.h> #include <gtk/gtkseparatormenuitem.h> -@@ -632,8 +634,17 @@ +@@ -632,8 +634,19 @@ } if (res == RESULT_RETRY) { -+ const char *path1; +- g_free (filename); +- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); ++ gchar *path1; + -+ g_free (path1); -+ path1 = g_strdup_printf("%s/.ncb", g_get_home_dir()); ++ path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir()); + + if (!g_file_test (path1, G_FILE_TEST_EXISTS)) { + mkdir (path1, 0700); + } + - g_free (filename); -- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); ++ if (filename != NULL) { ++ g_free (filename); ++ } + filename = g_build_filename (path1, "image.iso.XXXXXX", NULL); ++ g_free (path1); fd = g_mkstemp(filename); close (fd); |