[gnumeric] remove potential leak in odf import



commit 781db20a4beb8367560942d20e843135d8828f16
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Jun 28 12:40:01 2013 -0600

    remove potential leak in odf import
    
    2013-06-28  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (openoffice_file_open): make sure that the
        text stack is empty

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 088b3bc..71aa851 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2013-06-28  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+       * openoffice-read.c (openoffice_file_open): make sure that the
+       text stack is empty
+
+2013-06-28  Andreas J. Guelzow <aguelzow pyrshep ca>
+
        * openoffice-read.c (odf_text_content_end): check for null
        stack
        (ooo1_content_dtd): also connect oo_cell_content_start
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index b4fda93..e3c1d80 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -12175,6 +12175,10 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
        go_io_progress_unset (state.context);
        g_free (state.last_error);
 
+       /* This should be empty! */
+       while (state.text_p_stack)
+               odf_pop_text_p (&state);
+
        if (state.default_style.cells)
                odf_oo_cell_style_unref (state.default_style.cells);
        g_free (state.default_style.rows);


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