[gnumeric] ssconvert: avoid segfault when splitting workbook into sheets with no outfile



commit 0fe8a6ed6cebf1bf3b03859071809e8b8917a888
Author: Morten Welinder <terra gnome org>
Date:   Tue Feb 26 15:01:29 2013 -0500

    ssconvert: avoid segfault when splitting workbook into sheets with no outfile

 ChangeLog       |    4 ++++
 NEWS            |    1 +
 src/ssconvert.c |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 901f72d..983813a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-26  Morten Welinder  <terra gnome org>
+
+       * src/ssconvert.c (convert): Avoid segfault.  Fixes #694741.
+
 2013-02-26  Jean Brefort  <jean brefort normalesup org>
 
        * src/number-match.c: more introspection warnings.
diff --git a/NEWS b/NEWS
index 3037dde..f094c79 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,7 @@ Morten:
        * Track dependents of conditional formats.  [#654495] [#674954]
        * FreeBSD portability fix.  [#693761]
        * Introspection fixes.
+       * Fix ssconvert crash.  [#694741]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.0
diff --git a/src/ssconvert.c b/src/ssconvert.c
index b34472b..d5064ae 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -631,6 +631,7 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
                                    ssconvert_export_id);
                        goto out;
                } else if (outfile == NULL &&
+                          !ssconvert_one_file_per_sheet &&
                           go_file_saver_get_extension (fs) != NULL) {
                        char const *ext = gsf_extension_pointer (infile);
                        if (*infile) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]