diff options
| author | bland <bland@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-13 23:33:58 +0800 |
|---|---|---|
| committer | bland <bland@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-13 23:33:58 +0800 |
| commit | 9f70e0463289998f4c0c56a5bc304b13d3a8eae9 (patch) | |
| tree | cee6d07bb4adf86d399d194abe00f5d52d443e05 | |
| parent | fdbc9fc222039667bcaed03d94fd7a83418f66b5 (diff) | |
| download | marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.tar marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.tar.gz marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.tar.bz2 marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.tar.lz marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.tar.xz marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.tar.zst marcuscom-ports-9f70e0463289998f4c0c56a5bc304b13d3a8eae9.zip | |
Don't free memory not beeng allocated. This fixes abort() on .tar archives
when libc does memory allocation checking.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2047 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | archivers/file-roller/Makefile | 1 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-tar.c | 14 | ||||
| -rw-r--r-- | archivers/fileroller/Makefile | 1 | ||||
| -rw-r--r-- | archivers/fileroller/files/patch-src_fr-command-tar.c | 14 |
4 files changed, 24 insertions, 6 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index b1975b976..cf483f3d6 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -7,6 +7,7 @@ PORTNAME= fileroller PORTVERSION= 2.5.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index f6ff0af15..08704aa09 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,5 +1,5 @@ ---- src/fr-command-tar.c.orig Mon Mar 8 04:20:07 2004 -+++ src/fr-command-tar.c Mon Mar 8 14:50:03 2004 +--- src/fr-command-tar.c.orig Mon Mar 8 18:20:07 2004 ++++ src/fr-command-tar.c Sun Mar 14 00:14:41 2004 @@ -196,6 +196,11 @@ return g_strndup (f_start + 1, f_end - f_start); } @@ -21,7 +21,7 @@ + int i; + struct tm tm = {0, }; + char **time_fields; -+ char *field_name; ++ const char *field_name; g_return_if_fail (line != NULL); @@ -62,3 +62,11 @@ fields = g_strsplit (field_name, " -> ", 2); if (fields[1] == NULL) { +@@ -244,7 +257,6 @@ + if (fields[1] != NULL) + fdata->link = g_strdup (fields[1]); + g_strfreev (fields); +- g_free (field_name); + + fdata->name = g_strdup (file_name_from_path (fdata->full_path)); + fdata->path = remove_level_from_path (fdata->full_path); diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index b1975b976..cf483f3d6 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -7,6 +7,7 @@ PORTNAME= fileroller PORTVERSION= 2.5.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c index f6ff0af15..08704aa09 100644 --- a/archivers/fileroller/files/patch-src_fr-command-tar.c +++ b/archivers/fileroller/files/patch-src_fr-command-tar.c @@ -1,5 +1,5 @@ ---- src/fr-command-tar.c.orig Mon Mar 8 04:20:07 2004 -+++ src/fr-command-tar.c Mon Mar 8 14:50:03 2004 +--- src/fr-command-tar.c.orig Mon Mar 8 18:20:07 2004 ++++ src/fr-command-tar.c Sun Mar 14 00:14:41 2004 @@ -196,6 +196,11 @@ return g_strndup (f_start + 1, f_end - f_start); } @@ -21,7 +21,7 @@ + int i; + struct tm tm = {0, }; + char **time_fields; -+ char *field_name; ++ const char *field_name; g_return_if_fail (line != NULL); @@ -62,3 +62,11 @@ fields = g_strsplit (field_name, " -> ", 2); if (fields[1] == NULL) { +@@ -244,7 +257,6 @@ + if (fields[1] != NULL) + fdata->link = g_strdup (fields[1]); + g_strfreev (fields); +- g_free (field_name); + + fdata->name = g_strdup (file_name_from_path (fdata->full_path)); + fdata->path = remove_level_from_path (fdata->full_path); |