[gnumeric] fix crash
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] fix crash
- Date: Tue, 22 May 2012 06:49:41 +0000 (UTC)
commit ccd1ec7e42a754c41f9d1a8cc3ff3141e759d6b1
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Tue May 22 00:49:00 2012 -0600
fix crash
2012-05-21 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (oo_cell_content_end): check for NULL GString
plugins/openoffice/ChangeLog | 4 ++++
plugins/openoffice/openoffice-read.c | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 8db1767..347a1f1 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,9 @@
2012-05-21 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-read.c (oo_cell_content_end): check for NULL GString
+
+2012-05-21 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-read.c (odf_style_add_condition): try to recognize some
of the Gnumeric specific expressions.
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 9b1b55f..0631880 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -3883,7 +3883,8 @@ oo_cell_content_end (GsfXMLIn *xin, GsfXMLBlob *blob)
gnm_cell_assign_value (state->curr_cell, v);
} else if (state->text_p_for_cell.content_is_simple) {
odf_text_content_end (xin, blob);
- oo_add_text_to_cell (state, state->text_p_for_cell.gstr->str, state->text_p_for_cell.attrs);
+ if (state->text_p_for_cell.gstr)
+ oo_add_text_to_cell (state, state->text_p_for_cell.gstr->str, state->text_p_for_cell.attrs);
}
oo_update_data_extent (state, 1, 1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]