[gnumeric] xls: fuzzed file fix.



commit 831176a57f9352f8ef6d843080b12c382a86729c
Author: Morten Welinder <terra gnome org>
Date:   Tue Jan 5 09:50:11 2016 -0500

    xls: fuzzed file fix.

 NEWS                            |    2 +-
 plugins/excel/ChangeLog         |    5 +++++
 plugins/excel/ms-formula-read.c |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index a5583dd..fd7e335 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Morten:
        * Teach ssconvert to split sheets into separate .txt files [#694408]
        * Improve test suite.
        * Fuzzed file fixes.  [#760046] [#760085] [#760087] [#760089]
-         [#760043] [#760103] [#760102] [#760101] [#760105]
+         [#760043] [#760103] [#760102] [#760101] [#760105] [#760106]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.26
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 87fdd80..ee52032 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-05  Morten Welinder  <terra gnome org>
+
+       * ms-formula-read.c (excel_parse_formula1): Fix string length
+       capping.  Fixes #760106.
+
 2016-01-04  Morten Welinder  <terra gnome org>
 
        * ms-excel-read.c (excel_sheet_new): Undo last change.  Fix
diff --git a/plugins/excel/ms-formula-read.c b/plugins/excel/ms-formula-read.c
index 18232f1..96f754e 100644
--- a/plugins/excel/ms-formula-read.c
+++ b/plugins/excel/ms-formula-read.c
@@ -1314,7 +1314,7 @@ excel_parse_formula1 (MSContainer const *container,
 
                        str = excel_get_text (container->importer, cur+1,
                                              char_len, &byte_len, NULL,
-                                             len_left - 1);
+                                             len_left - 2);
                        ptg_length = 1 + byte_len;
 
                        if (str != NULL) {


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