[gnumeric] xml: fuzzed file fix.



commit 63e58523215b7313e3aef91d40bbe3c8dd47669f
Author: Morten Welinder <terra gnome org>
Date:   Wed Jan 13 08:05:36 2016 -0500

    xml: fuzzed file fix.

 ChangeLog          |    5 +++++
 NEWS               |    2 +-
 src/xml-sax-read.c |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5c7d5fe..2147006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-13  Morten Welinder  <terra gnome org>
+
+       * src/xml-sax-read.c (xml_sax_filter_condition): Ensure o0 and op1
+       are sane.  Fixes #760544.
+
 2016-01-08  Morten Welinder  <terra gnome org>
 
        * src/sf-dpq.c (drayleigh): Undo last change and improve accuracy.
diff --git a/NEWS b/NEWS
index 55b7db8..6312269 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Morten:
        * Improve test suite.
        * Fuzzed file fixes.  [#760046] [#760085] [#760087] [#760089]
          [#760043] [#760103] [#760102] [#760101] [#760105] [#760106]
-         [#760104] [#760229] [#760231] [#760232]
+         [#760104] [#760229] [#760231] [#760232] [#760544]
        * Fix R.DBINOM extreme-value case.  [#760230]
        * New function AGM.
 
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index d23eff5..a7c57bf 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -2299,7 +2299,7 @@ xml_sax_filter_condition (GsfXMLIn *xin, xmlChar const **attrs)
        char const *val0 = NULL;
        char const *val1 = NULL;
        GnmValueType vtype0 = VALUE_EMPTY, vtype1 = VALUE_EMPTY;
-       GnmFilterOp op0, op1;
+       GnmFilterOp op0 = GNM_FILTER_UNUSED, op1 = GNM_FILTER_UNUSED;
        GnmFilterCondition *cond = NULL;
        gboolean top = TRUE, items = TRUE, is_and = FALSE;
        int i, tmp, cond_num = 0;


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