[gnumeric] Don't read missing data. [#751909]



commit 5e8f429baa75c6648f06ceeb4120772a7f4ef6af
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Jul 4 16:33:46 2015 +0200

    Don't read missing data. [#751909]

 NEWS                          |    2 +-
 plugins/excel/ChangeLog       |    4 ++++
 plugins/excel/ms-excel-read.c |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 298709f..8f1410a 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Jean:
        * Fix out of bounds read. [#749121]
        * Fuzzed file fixes.  [#750042] [#751217] [#751270] [#751271]
          [#751383] [#751384] [#751758] [#751744] [#751908] [#751920]
-         [#751249] [#751945]
+         [#751249] [#751945] [#751909]
 
 Morten:
        * Fix import/export of graph backplane.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index a38b829..60e9f36 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-04  Jean Brefort  <jean brefort normalesup org>
+
+       * ms-excel-read.c (excel_read_FONT): don't read missing data. [#751909]
+
 2015-07-03  Jean Brefort  <jean brefort normalesup org>
 
        * ms-chart.c (end): protect against missing value. Fixes #751945.
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 4a928ae..5adaf63 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -1618,6 +1618,7 @@ excel_read_FONT (BiffQuery *q, GnmXLImporter *importer)
                if (ms_biff_query_peek_next (q, &opcode) &&
                    opcode == BIFF_FONT_COLOR) {
                        ms_biff_query_next (q);
+                       XL_CHECK_CONDITION (q->length >= 2);
                        fd->color_idx  = GSF_LE_GET_GUINT16 (q->data);
                } else
                        fd->color_idx  = 0x7f;


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