[file-roller] Fixed crashes when trying to create a tar.z7 archive
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] Fixed crashes when trying to create a tar.z7 archive
- Date: Thu, 6 May 2010 07:16:32 +0000 (UTC)
commit e1fe661156920c96bae149689bf8415c1376b6a7
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 6 09:15:37 2010 +0200
Fixed crashes when trying to create a tar.z7 archive
due to a missing sentinel in a varargs call.
[bug #617840]
src/fr-command-tar.c | 2 +-
src/fr-process.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index 63626c9..2290a01 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -684,7 +684,7 @@ fr_command_tar_recompress (FrCommand *comm)
fr_process_add_arg (comm->process, "-l");
new_name = g_strconcat (c_tar->uncomp_filename, ".7z", NULL);
- fr_process_add_arg_concat (comm->process, new_name);
+ fr_process_add_arg_concat (comm->process, new_name, NULL);
fr_process_add_arg (comm->process, c_tar->uncomp_filename);
fr_process_end_command (comm->process);
diff --git a/src/fr-process.h b/src/fr-process.h
index 24c0289..d519b03 100644
--- a/src/fr-process.h
+++ b/src/fr-process.h
@@ -97,7 +97,7 @@ void fr_process_add_arg (FrProcess *fr_proc,
const char *arg);
void fr_process_add_arg_concat (FrProcess *fr_proc,
const char *arg,
- ...);
+ ...) G_GNUC_NULL_TERMINATED;
void fr_process_add_arg_printf (FrProcess *fr_proc,
const char *format,
...) G_GNUC_PRINTF (2, 3);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]