[gnumeric] xlsx: fix fuzzed file FMR.



commit 9b7cc390ad7fec1d45f41fa06f1c04e4de7a3063
Author: Morten Welinder <terra gnome org>
Date:   Tue Nov 19 13:21:48 2013 -0500

    xlsx: fix fuzzed file FMR.

 NEWS                              |    2 +-
 plugins/excel/ChangeLog           |    3 +++
 plugins/excel/xlsx-read-drawing.c |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 8728cc0..eb87173 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ Morten:
        * Improve accuracy of COMBIN, PERMUT, POCHHAMMER, FACT, GAMMA.
        * Improve accuracy of bessel functions with large non-integer alpha.
        * Improve accuracy of ACOTH.
-       * Fix fuzzed file crash.  [#708091] [#712662] [#712685]
+       * Fix fuzzed file crash.  [#708091] [#712662] [#712685] [#712700]
        * Restore sheet reordering by drag.
        * Fix BETA on win32.
        * Fix win32 registry initialization.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 8abcf6d..c13e737 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-19  Morten Welinder  <terra gnome org>
 
+       * xlsx-read-drawing.c (xlsx_style_line_end): Clear the current
+       color.  Fixes #712700.
+
        * ms-excel-read.c (excel_read_MERGECELLS): Fix FMR [#712685]
 
 2013-11-11  Morten Welinder  <terra gnome org>
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index b41b612..196a617 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -1172,6 +1172,7 @@ xlsx_style_line_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 {
        XLSXReadState   *state = (XLSXReadState *)xin->user_state;
        state->sp_type &= ~GO_STYLE_LINE;
+       state->gocolor = NULL;
 }
 
 static void


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