[gnumeric] xlsx: fuzzed file fix re names.



commit be77241dbb3e1ed3254e78e1c009894cf213a5b3
Author: Morten Welinder <terra gnome org>
Date:   Tue Jun 16 08:31:24 2015 -0400

    xlsx: fuzzed file fix re names.

 NEWS                      |    2 +-
 plugins/excel/xlsx-read.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 08922bb..11d04f9 100644
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ Morten:
          [#749069] [#748533] [#749118] [#749166] [#749181] [#749184]
          [#749236] [#749240] [#749234] [#749235] [#749271] [#749270]
          [#749424] [#749917] [#749919] [#750043] [#750044] [#750046]
-         [#750811] [#750810] [#750857] [#750864] [#750862]
+         [#750811] [#750810] [#750857] [#750864] [#750862] [#750858]
        * Make solver check linearity of model.
        * Fix xls saving of marker style.  [#749185]
        * Make compilation with clang work again.  [#749138]
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 52d9b25..61899db 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -3693,8 +3693,10 @@ xlsx_wb_name_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
                nexpr = expr_name_add (&pp, state->defined_name + 6,
                                       gnm_expr_top_new_constant (value_new_empty ()),
                                       &error_msg, TRUE, NULL);
-               nexpr->is_permanent = TRUE;
-               nexpr->is_editable = editable;
+               if (nexpr) {
+                       nexpr->is_permanent = TRUE;
+                       nexpr->is_editable = editable;
+               }
        } else
                nexpr = expr_name_add (&pp, state->defined_name,
                                       gnm_expr_top_new_constant (value_new_empty ()),


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