[gnumeric] ods: fix UMR.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] ods: fix UMR.
- Date: Sun, 25 May 2014 19:40:14 +0000 (UTC)
commit 931691ecefb2f8242845235449bceb22cef29d5b
Author: Morten Welinder <terra gnome org>
Date: Sun May 25 15:39:56 2014 -0400
ods: fix UMR.
NEWS | 3 +++
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-read.c | 6 +++---
3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index de97d10..ad62193 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
Gnumeric 1.12.17
+Morten:
+ * Fix UMR. [#730727]
+
--------------------------------------------------------------------------
Gnumeric 1.12.16
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 71de326..bd3dc13 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-25 Morten Welinder <terra gnome org>
+
+ * openoffice-read.c (oo_db_range_start): Fix uninitialized memory
+ usage. [#730727]
+
2014-05-23 Morten Welinder <terra gnome org>
* Release 1.12.16
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 3557212..1961f79 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7531,13 +7531,13 @@ oo_db_range_start (GsfXMLIn *xin, xmlChar const **attrs)
':' == *ptr &&
'\0' == *oo_cellref_parse (&ref.b, ptr+1, &state->pos, NULL) &&
ref.b.sheet != invalid_sheet) {
+ range_init_rangeref (&r, &ref);
if (buttons)
- state->filter = gnm_filter_new
- (ref.a.sheet, range_init_rangeref (&r, &ref));
+ state->filter = gnm_filter_new (ref.a.sheet, &r);
expr = gnm_expr_new_constant
(value_new_cellrange_r (ref.a.sheet, &r));
} else
- oo_warning (xin, _("Invalid DB range '%s'"), attrs[1]);
+ oo_warning (xin, _("Invalid DB range '%s'"), target);
}
/* It appears that OOo likes to use the names it assigned to filters as named-ranges */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]