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



commit 998191b13b7cf78151d69624088fd831df630871
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Jul 29 11:08:57 2013 -0600

    Fix crash on corrupted files. [#705032]
    
    2013-07-29  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_print_spreadsheet_content_validations): warn
        on NULL validation

 NEWS                                  |    2 +-
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |    5 +++++
 3 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 0098c03..0b04950 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]
+       * Fix crash on corrupted files. [#704636] [#705032]
        * Fix ODF import of charts with series consisting of multiple ranges. [#704742]
        * Fix ODF export of charts with series consisting of multiple ranges.
 
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 236fd0c..37d4542 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-29  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-write.c (odf_print_spreadsheet_content_validations): warn
+       on NULL validation
+
 2013-07-26  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (odf_header_footer_left): new
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 1c198f4..b79791f 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -4463,6 +4463,11 @@ odf_print_spreadsheet_content_validations (GnmOOExport *state)
                        GnmParsePos pp;
                        char const *message_type = NULL;
 
+                       if (val == NULL) {
+                               g_warning ("NULL validation encountered!");
+                               continue;
+                       }
+
                        if (!element_written) {
                                gsf_xml_out_start_element
                                        (state->xml, TABLE "content-validations");


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