[gnumeric] xlsx: fuzzed file fix.



commit 70214e2b0d2fb6c6a9398032964a1fc7411db0c5
Author: Morten Welinder <terra gnome org>
Date:   Sun Feb 7 14:58:41 2016 -0500

    xlsx: fuzzed file fix.

 NEWS                              |    3 +++
 plugins/excel/ChangeLog           |    5 +++++
 plugins/excel/xlsx-read-drawing.c |    3 +++
 3 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index c39afc5..f4dffb5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.28
 
+Morten:
+       * Fuzzed file fixes.  [#761663]
+
 --------------------------------------------------------------------------
 Gnumeric 1.12.27
 
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 8fa1065..d774aad 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-07  Morten Welinder  <terra gnome org>
+
+       * xlsx-read-drawing.c (xlsx_rpr_latin): Check that null style.
+       Fixes #761663.
+
 2016-02-06  Morten Welinder <terra gnome org>
 
        * Release 1.12.27
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 7142179..8b29489 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -293,6 +293,9 @@ xlsx_rpr_latin (GsfXMLIn *xin, xmlChar const **attrs)
        XLSXReadState *state = (XLSXReadState *)xin->user_state;
        GOStyle *style = state->cur_style;
 
+       if (!GO_IS_STYLED_OBJECT (state->cur_obj) || !style)
+               return;
+
        for (; attrs && *attrs; attrs += 2) {
                if (strcmp (attrs[0], "typeface") == 0) {
                        PangoFontDescription *desc = pango_font_description_copy (style->font.font->desc);


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