[gnumeric] xls: fix read crash.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] xls: fix read crash.
- Date: Wed, 18 Jul 2012 15:39:23 +0000 (UTC)
commit 4a7d9f36b7f97813f94d70032ddcd4e4a1e99254
Author: Morten Welinder <terra gnome org>
Date: Wed Jul 18 11:38:37 2012 -0400
xls: fix read crash.
NEWS | 3 +++
plugins/excel/ChangeLog | 4 ++++
plugins/excel/ms-excel-read.c | 2 ++
3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 774bb75..b99e156 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
Gnumeric 1.11.6
+Morten:
+ * Fix xls read crash. [#679992]
+
--------------------------------------------------------------------------
Gnumeric 1.11.5
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 6ddb102..cd9b823 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-18 Morten Welinder <terra gnome org>
+
+ * ms-excel-read.c (excel_read_LABEL): Fix crash [#679992].
+
2012-07-15 Morten Welinder <terra gnome org>
* Release 1.11.5
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 15cbaa0..d39d8a8 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -6216,6 +6216,8 @@ excel_read_LABEL (BiffQuery *q, ExcelReadSheet *esheet, gboolean has_markup)
XL_CHECK_CONDITION (q->length - 8 >= in_len);
xf = excel_set_xf (esheet, q);
+ if (!xf)
+ return;
fd = excel_font_get (esheet->container.importer, xf->font_idx);
txt = excel_get_text_fixme (esheet->container.importer, q->data + 8,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]