diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-19 13:17:35 +0000 |
|---|---|---|
| committer | Fabian Affolter <fabian@affolter-engineering.ch> | 2012-09-21 22:27:39 +0000 |
| commit | 3c1b9ba6206079e7937c8e8ed5919d5545f1c541 (patch) | |
| tree | 64e1dbf273987fdd0b46f34185e5adf5897e3910 /testing | |
| parent | 9bf768a200d9e12118c9b41fafdab9bc18c4b246 (diff) | |
| download | aports-3c1b9ba6206079e7937c8e8ed5919d5545f1c541.tar.bz2 aports-3c1b9ba6206079e7937c8e8ed5919d5545f1c541.tar.xz | |
testing/xfburn: rebuild
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/xfburn/fix_empty_dir_segfault.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/testing/xfburn/fix_empty_dir_segfault.patch b/testing/xfburn/fix_empty_dir_segfault.patch new file mode 100644 index 0000000000..93418ae413 --- /dev/null +++ b/testing/xfburn/fix_empty_dir_segfault.patch @@ -0,0 +1,48 @@ +--- ./xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 ++++ ./xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 +@@ -1874,26 +1874,29 @@ + g_error ("Failed adding %s as a node to the image: code %X!", src, r); + } + +- basename = g_path_get_basename (src); ++ /* Check names only for items not manually created (#613563) */ ++ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { ++ basename = g_path_get_basename (src); ++ ++ /* check if the file has been renamed */ ++ if (strcmp (basename, name) != 0) { ++ /* rename the iso_node */ ++ r = iso_node_set_name (node, name); ++ ++ if (r == 0) { ++ /* The first string is the renamed name, the second one the original name */ ++ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); ++ ++ g_free (basename); ++ g_free (name); ++ g_free (src); + +- /* check if the file has been renamed */ +- if (strcmp (basename, name) != 0) { +- /* rename the iso_node */ +- r = iso_node_set_name (node, name); +- +- if (r == 0) { +- /* The first string is the renamed name, the second one the original name */ +- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); +- +- g_free (basename); +- g_free (name); +- g_free (src); +- +- continue; ++ continue; ++ } + } ++ g_free (basename); + } + +- g_free (basename); + g_free (name); + g_free (src); + |