[gnumeric] xls: fuzzed file fix.



commit f60149e2985aaefe0ea33e67e3aef6f3ca6d67dd
Author: Morten Welinder <terra gnome org>
Date:   Sat Jan 2 18:40:24 2016 -0500

    xls: fuzzed file fix.

 NEWS                    |    2 +-
 plugins/excel/ChangeLog |    5 +++++
 plugins/excel/ms-biff.c |    6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index dbfe9fa..5a9fdc7 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ Andreas:
 Morten:
        * Teach ssconvert to split sheets into separate .txt files [#694408]
        * Improve test suite.
-       * Fuzzed file fixes.  [#760046]  [#760085]  [#760087]
+       * Fuzzed file fixes.  [#760046]  [#760085]  [#760087]  [#760089]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.26
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 4b71ae6..f707409 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-02  Morten Welinder  <terra gnome org>
+
+       * ms-biff.c (ms_biff_query_next): Don't handle CONTINUE records
+       for BOUNDSHEET.  Fixes #760089.
+
 2015-12-28  Morten Welinder <terra gnome org>
 
        * Release 1.12.26
diff --git a/plugins/excel/ms-biff.c b/plugins/excel/ms-biff.c
index 7af88a2..aedf7bb 100644
--- a/plugins/excel/ms-biff.c
+++ b/plugins/excel/ms-biff.c
@@ -507,7 +507,6 @@ ms_biff_query_next (BiffQuery *q)
         */
        switch (q->opcode) {
        case BIFF_BG_PIC:
-       case BIFF_BOUNDSHEET:
        case BIFF_CF:
        case BIFF_CODENAME:
        case BIFF_CONDFMT:
@@ -538,8 +537,11 @@ ms_biff_query_next (BiffQuery *q)
        case BIFF_SUPBOOK:
                auto_continue = TRUE;
                break;
-       case BIFF_CONTINUE:
 
+       case BIFF_BOUNDSHEET:
+               // Needs access to non_decrypted_data
+       case BIFF_CONTINUE:
+               // Eh?
        case BIFF_TXO:
                /*
                 * The continuation of the string part seems to repeat the


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