diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-19 14:11:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-19 14:41:41 +0000 |
| commit | edbc215ba64450118feb5722315dcb48d953e8cd (patch) | |
| tree | a26a53a9d41706f1eeab84330a48b80ee9c22b6a /main/xfburn/fix_empty_dir_segfault.patch | |
| parent | 28f536e51ecc7ce2a637d2339d192b7051e4d748 (diff) | |
| download | aports-edbc215ba64450118feb5722315dcb48d953e8cd.tar.bz2 aports-edbc215ba64450118feb5722315dcb48d953e8cd.tar.xz | |
main/xfburn: move from testing
Diffstat (limited to 'main/xfburn/fix_empty_dir_segfault.patch')
| -rw-r--r-- | main/xfburn/fix_empty_dir_segfault.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/main/xfburn/fix_empty_dir_segfault.patch b/main/xfburn/fix_empty_dir_segfault.patch new file mode 100644 index 0000000000..93418ae413 --- /dev/null +++ b/main/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); + |