[gnumeric] Fuzzed file fixes. [#751907]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fuzzed file fixes. [#751907]
- Date: Fri, 3 Jul 2015 18:37:55 +0000 (UTC)
commit 37604a5124ba4b9405ce214a2a7d92dd1472b5b6
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Fri Jul 3 12:38:37 2015 -0600
Fuzzed file fixes. [#751907]
2015-07-03 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (oo_add_text_to_cell): check whether the cell
has a value.
NEWS | 2 +-
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-read.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 1a36c10..30f7cc6 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ Andreas:
* Improve function import to ODF. [#750627]
* Add CONFIDENCE.T, MODE.MULT, PERCENTILE.EXC, PERCENTRANK.EXC
and QUARTILE.EXC.
- * Fuzzed file fixes. [#751060] [#751501]
+ * Fuzzed file fixes. [#751060] [#751501] [#751907]
* Fix ODF import of named expressions. [#750627]
* Import reference unions from ODF. [#750627]
* Improve CONVERT function.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index e9de8b8..471362e 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-03 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-read.c (oo_add_text_to_cell): check whether the cell
+ has a value.
+
2015-07-02 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (od_series_reg_equation): Do not asssume that
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 67b1c13..f1d36cf 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4169,7 +4169,7 @@ oo_add_text_to_cell (OOParseState *state, char const *str, PangoAttrList *attrs)
if (state->curr_cell == NULL)
return;
- if (VALUE_IS_STRING (state->curr_cell->value)) {
+ if ((NULL != state->curr_cell->value) && VALUE_IS_STRING (state->curr_cell->value)) {
GOFormat *fmt = state->curr_cell->value->v_str.fmt;
start = strlen (state->curr_cell->value->v_str.val->str);
if (fmt != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]