[gnumeric] Fix crash on corrupted files. [#705172]



commit 39d1af22549729612b71cecfa9ee5af58e10a9a7
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Jul 31 01:50:24 2013 -0600

    Fix crash on corrupted files. [#705172]
    
    2013-07-31  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (oo_set_gnm_border): check for old_border == NULL

 NEWS                                 |    2 +-
 plugins/openoffice/ChangeLog         |    7 +++++++
 plugins/openoffice/openoffice-read.c |    4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 2813103..5a99539 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Andreas:
        * Improve import to ODF of empty cells with default column styles. [#704563]
        * Speed up loading of some ODF files. [#704422]
        * Fix ODF style import. [#704563]
-       * Fix crash on corrupted files. [#704636] [#705032] [#705031] [#705101]
+       * Fix crash on corrupted files. [#704636] [#705032] [#705031] [#705101] [#705172]
        * Fix ODF import of charts with series consisting of multiple ranges. [#704742]
        * Fix ODF export of charts with series consisting of multiple ranges.
        * Do not show placeholders in function tooltip. [#705049]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 00165c4..a44d61f 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-31  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (oo_set_gnm_border): check for old_border == NULL
+
+2013-07-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (od_draw_object): clear chart.i_plot_styles
 2013-07-30  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (od_draw_object): clear chart.i_plot_styles
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 30eff3e..e38f56a 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -5913,7 +5913,9 @@ oo_set_gnm_border  (G_GNUC_UNUSED GsfXMLIn *xin, GnmStyle *style,
 
        old_border = gnm_style_get_border (style, location);
        new_border = gnm_style_border_fetch (border_style,
-                                            style_color_ref(old_border->color),
+                                            old_border ? 
+                                            style_color_ref(old_border->color) 
+                                            : style_color_black (),
                                             gnm_style_border_get_orientation (loc));
        gnm_style_set_border (style, location, new_border);
 }


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