[gnumeric] Fix crash on corrupted files. [#705385]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix crash on corrupted files. [#705385]
- Date: Sat, 3 Aug 2013 08:16:51 +0000 (UTC)
commit 4a70a5eebf9c53d3b75bfe76ebe46aa4c42a0def
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Sat Aug 3 02:15:42 2013 -0600
Fix crash on corrupted files. [#705385]
2013-08-03 Andreas J. Guelzow <aguelzow pyrshep ca>
* ms-excel-read.c (excel_read_LABEL): check for NULL fd
NEWS | 2 +-
plugins/excel/ChangeLog | 4 ++++
plugins/excel/ms-excel-read.c | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index fddceac..81116a9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Andreas:
* Improve import to ODF of empty cells with default column styles. [#704563]
* Speed up loading of some ODF files. [#704422]
* Fix ODF style import. [#704563]
- * Fix crash on corrupted files. [#704636]
+ * Fix crash on corrupted files. [#704636] [#705385]
* Fix ODF import of charts with series consisting of multiple ranges. [#704742]
* Fix ODF export of charts with series consisting of multiple ranges.
* Implement input message editing. [Part of #705310]
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 0a5323b..edbd6fd 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-03 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * ms-excel-read.c (excel_read_LABEL): check for NULL fd
+
2013-08-02 Jean Brefort <jean brefort normalesup org>
* ms-chart.c (axislineformat): fix crah on fuzzed xls reading [#705353],
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 59ac10f..f987d0d 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -6259,7 +6259,7 @@ excel_read_LABEL (BiffQuery *q, ExcelReadSheet *esheet, gboolean has_markup)
fd = excel_font_get (esheet->container.importer, xf->font_idx);
txt = excel_get_text_fixme (esheet->container.importer, q->data + 8,
- in_len, &str_len, &fd->codepage);
+ in_len, &str_len, fd ? &fd->codepage : NULL);
d (0, g_printerr ("%s in %s;\n",
has_markup ? "formatted string" : "string",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]