[gnumeric] Print: fix crash.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnumeric] Print: fix crash.
- Date: Fri, 11 Sep 2009 12:44:34 +0000 (UTC)
commit 31cc4704155423a9f01df207144b3c280f1f683d
Author: Morten Welinder <terra gnome org>
Date: Fri Sep 11 08:44:22 2009 -0400
Print: fix crash.
ChangeLog | 5 +++++
NEWS | 1 +
src/gnm-so-filled.c | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d7a7e8b..162999c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11 Morten Welinder <terra gnome org>
+
+ * src/gnm-so-filled.c (gnm_so_filled_draw_cairo): NULL-check
+ ->text like elsewhere. Fixes 594862.
+
2009-09-09 Morten Welinder <terra gnome org>
* src/wbc-gtk-edit.c (wbcg_edit_start): Make "inside_editing" a
diff --git a/NEWS b/NEWS
index 5c5ad9c..251c60d 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.9.13
Morten:
* Fixes text export GUI issue. [#594155]
* Fix minor status line issue. [#594469]
+ * Fix print crash for sheet object. [#594862]
--------------------------------------------------------------------------
Gnumeric 1.9.12
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 657dd0e..2cbeb87 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -258,7 +258,7 @@ gnm_so_filled_draw_cairo (SheetObject const *so, cairo_t *cr,
GO_COLOR_UINT_A(style->line.color));
cairo_stroke (cr);
/* Draw the text. */
- if (*(sof->text) != '\0') {
+ if (sof->text != NULL && *(sof->text) != '\0') {
PangoLayout *pl = pango_cairo_create_layout (cr);
double pl_height = (height - sof->margin_pts.top
- sof->margin_pts.bottom) * PANGO_SCALE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]