[gnumeric] Sheet filter: fix UMR.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Sheet filter: fix UMR.
- Date: Fri, 10 Apr 2015 00:39:43 +0000 (UTC)
commit 1c72a5f7697f9bd5654e26849ff0e0156dc0cbcf
Author: Morten Welinder <terra gnome org>
Date: Thu Apr 9 20:39:06 2015 -0400
Sheet filter: fix UMR.
...and potentially an ABR too.
ChangeLog | 5 +++++
NEWS | 1 +
src/sheet-filter.c | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4758e00..7259b0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-09 Morten Welinder <terra gnome org>
+
+ * src/sheet-filter.c (filter_expr_eval): Fix UMR in the non-match
+ case.
+
2015-04-04 Morten Welinder <terra gnome org>
* src/xml-sax-read.c (xml_sax_read_obj): Fix reading anchor mode.
diff --git a/NEWS b/NEWS
index 7e55cc9..d0a3a82 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ Morten:
* Improve reading of xlsx theme colours.
* Plug leaks.
* Fix REPLACEB problem. [#747210]
+ * Fix sheet filter problem.
--------------------------------------------------------------------------
Gnumeric 1.12.21
diff --git a/src/sheet-filter.c b/src/sheet-filter.c
index 3db6529..bd25e5b 100644
--- a/src/sheet-filter.c
+++ b/src/sheet-filter.c
@@ -232,7 +232,7 @@ filter_expr_eval (GnmFilterOp op, GnmValue const *src, GORegexp const *regexp,
char *str = filter_cell_contents (cell);
GORegmatch rm;
int res = go_regexec (regexp, str, 1, &rm, 0);
- gboolean whole = (rm.rm_so == 0 && str[rm.rm_eo] == 0);
+ gboolean whole = (res == GO_REG_OK && rm.rm_so == 0 && str[rm.rm_eo] == 0);
g_free (str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]