gnumeric r16672 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Thu Jun 26 01:43:40 2008
New Revision: 16672
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16672&view=rev

Log:
2008-06-25  Morten Welinder  <terra gnome org>

	* src/mathfunc.c (phyper): Short-circuit x>=NR case.  Fixes
	#540211.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/mathfunc.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Jun 26 01:43:40 2008
@@ -2,6 +2,7 @@
 
 Morten:
 	* Fix EOMONTH issue.  [#540069]
+	* Fix phyper hang.  [#540211]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.1

Modified: trunk/src/mathfunc.c
==============================================================================
--- trunk/src/mathfunc.c	(original)
+++ trunk/src/mathfunc.c	Thu Jun 26 01:43:40 2008
@@ -3372,6 +3372,9 @@
 
     if (x < 0)
 	return R_DT_0;
+    /* Warning: the following line is not in R: */
+    if (x >= NR)
+	return R_DT_1;
 
     d  = dhyper (x, NR, NB, n, log_p);
     pd = pdhyper(x, NR, NB, n, log_p);