Commit ac264f02 authored by Morten Welinder's avatar Morten Welinder

xlsx: fix fuzzed file crash.

parent 9517c2eb
......@@ -14,6 +14,7 @@ Morten:
* Avoid some overflows in IMGAMMA.
* Fix tabulation truncation issue.
* Fix ABR. [#720353]
* Fix fuzzed file crash. [#720425]
--------------------------------------------------------------------------
Gnumeric 1.12.9
......
2013-12-13 Morten Welinder <terra@gnome.org>
* xlsx-read.c (xlsx_cell_end): Make sure state->texpr ends up
NULL. Fixes #720425.
2013-11-28 Morten Welinder <terra@gnome.org>
* Release 1.12.9
......
......@@ -1335,7 +1335,7 @@ xlsx_cell_expr_begin (GsfXMLIn *xin, xmlChar const **attrs)
has_range = TRUE;
state->shared_id = NULL;
if (is_shared && NULL != shared_id) {
if (is_shared && NULL != shared_id) {
if (!has_range)
state->texpr = g_hash_table_lookup (state->shared_exprs, shared_id);
if (NULL != state->texpr)
......@@ -1446,9 +1446,10 @@ xlsx_cell_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
gnm_cell_set_expr (cell, state->texpr);
gnm_expr_top_unref (state->texpr);
}
state->texpr = NULL;
} else if (NULL != state->val)
gnm_cell_assign_value (cell, state->val);
state->texpr = NULL;
state->val = NULL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment