[gnumeric] xls: fix crash for really old format.



commit 3328d30453930f3e0e11f9dc2259b3968f6bbcb0
Author: Morten Welinder <terra gnome org>
Date:   Tue Oct 2 12:44:02 2018 -0400

    xls: fix crash for really old format.

 NEWS                          | 1 +
 plugins/excel/ChangeLog       | 6 ++++++
 plugins/excel/ms-excel-read.c | 4 +---
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 25ab2ba42..0f4b5e887 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.12.44
 Morten:
        * Fix SWITCH's default argument.  [#354]
        * Fix problem with setting auto-func.  [#357]
+       * Fix problem reading really old xls format.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.43
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 5c984545f..3ce7a0765 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-02  Morten Welinder  <terra gnome org>
+
+       * ms-excel-read.c (excel_read_BOF): No need to set sheet and unref
+       here for old-format full-sheet graph.  It's already done in
+       ms_excel_chart_read.
+
 2018-08-19  Morten Welinder <terra gnome org>
 
        * Release 1.12.43
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index d0cdac78a..c712b6148 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -7135,14 +7135,12 @@ excel_read_BOF (BiffQuery        *q,
                if (ver->type == MS_BIFF_TYPE_Worksheet) {
                        excel_read_sheet (q, importer, wb_view, esheet);
                        ms_container_realize_objs (sheet_container (esheet));
-                       /* reverse the sheet objects satck order */
+                       /* reverse the sheet objects stack order */
                        esheet->sheet->sheet_objects = g_slist_reverse (esheet->sheet->sheet_objects);
                } else {
                        SheetObject *obj = sheet_object_graph_new (NULL);
                        ms_excel_chart_read (q, sheet_container (esheet),
                                             obj, esheet->sheet);
-                       sheet_object_set_sheet (obj, esheet->sheet);
-                       g_object_unref (obj);
                }
 
        } else if (ver->type == MS_BIFF_TYPE_VBModule ||


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