gnumeric r16565 - in branches/gnumeric-1-8: . plugins/fn-lookup

[mortenw svn gnome org]

Author: mortenw
Date: Fri May 16 20:11:15 2008
New Revision: 16565
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16565&view=rev

Log:
2008-05-16  Morten Welinder  <terra gnome org>

	* functions.c (gnumeric_areas): Check the value type of the
	calculation function result, not something weird with the call
	itself.  Fixes #533370.



Modified:
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/plugins/fn-lookup/ChangeLog
   branches/gnumeric-1-8/plugins/fn-lookup/functions.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Fri May 16 20:11:15 2008
@@ -26,6 +26,7 @@
 	* Fix right/center text for Quattro Pro files.
 	* Fix problem with sheet changes during range selection.  [#529309]
 	* Fix hang.  [#533288]
+	* Fix AREAS crash.  [#533370]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.2

Modified: branches/gnumeric-1-8/plugins/fn-lookup/functions.c
==============================================================================
--- branches/gnumeric-1-8/plugins/fn-lookup/functions.c	(original)
+++ branches/gnumeric-1-8/plugins/fn-lookup/functions.c	Fri May 16 20:11:15 2008
@@ -629,7 +629,7 @@
 	case GNM_EXPR_OP_FUNCALL: {
 		GnmValue *v = gnm_expr_eval (expr, ei->pos,
 			GNM_EXPR_EVAL_PERMIT_NON_SCALAR);
-		if (expr->constant.value->type == VALUE_CELLRANGE)
+		if (v->type == VALUE_CELLRANGE)
 			res = 1;
 		value_release (v);
 		break;