[gnumeric] Harden ODF import against fuzzed files. [#747447]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 486b6000baae5cec23e093140e238f595c39ec9f
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Apr 7 18:31:53 2015 -0600

    Harden ODF import against fuzzed files. [#747447]
    
    2015-04-07  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (oo_cell_content_start): avoid missing
        the odf_push_text_p

 NEWS                                 |    1 +
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    3 ++-
 3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 7abb7cc..56afd1f 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Andreas:
        * Improve ODF import/export of additional axes. [#746321]
        * Fix ODF export of styles for additional axes. [#746621]
        * Simplify export of SEC and SECH to ODF. [#747211]
+       * Harden ODF import against fuzzed files. [#747447]
 
 Jean:
        * Fix signal handling while running Python. [#744638]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c32172e..ea3f2d5 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-07  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (oo_cell_content_start): avoid missing
+       the odf_push_text_p
+
 2015-04-02  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-write.c (odf_func_sec_handler): deleted
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index ca4abd6..435a170 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4225,6 +4225,8 @@ oo_cell_content_start (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
 {
        OOParseState *state = (OOParseState *)xin->user_state;
 
+       odf_push_text_p (state, TRUE);
+
        if (state->text_p_for_cell.content_is_simple) {
                int max_cols = gnm_sheet_get_max_cols (state->pos.sheet);
                int max_rows = gnm_sheet_get_max_rows (state->pos.sheet);
@@ -4247,7 +4249,6 @@ oo_cell_content_start (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
                }
        }
 
-       odf_push_text_p (state, TRUE);
 }