1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
From fb7e7a602473fe2f11c78baacacaad1aea8c9dc6 Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick@xfce.org>
Date: Wed, 30 Nov 2011 17:45:57 +0000
Subject: Fix segfault when plugin returns a NULL suffix.
(cherry picked from commit 6f813ba48553e5b95a83bfa8463b20b8ee4607c4)
---
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index 1aa7b77..91a47e1 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -823,10 +823,9 @@ thunar_renamer_model_process_item (ThunarRenamerModel *renamer_model,
/* determine the new suffix */
suffix = thunarx_renamer_process (renamer_model->renamer, THUNARX_FILE_INFO (item->file), dot + 1, idx);
- /* generate the new file name */
- name = g_new (gchar, (dot - display_name) + 1 + strlen (suffix) + 1);
- memcpy (name, display_name, (dot - display_name) + 1);
- memcpy (name + (dot - display_name) + 1, suffix, strlen (suffix) + 1);
+ prefix = g_strndup (display_name, (dot - display_name) + 1);
+ name = g_strconcat (prefix, suffix, NULL);
+ g_free (prefix);
/* release the suffix */
g_free (suffix);
--
cgit v0.9.0.2
|
