Index: src/backend/utils/adt/float.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/adt/float.c,v
retrieving revision 1.131
diff -c -c -r1.131 float.c
*** src/backend/utils/adt/float.c	23 Dec 2006 02:13:24 -0000	1.131
--- src/backend/utils/adt/float.c	24 Dec 2006 06:48:08 -0000
***************
*** 104,111 ****
  int			extra_float_digits = 0;		/* Added to DBL_DIG or FLT_DIG */
  
  
! static void CheckFloat4Val(double val);
! static void CheckFloat8Val(double val);
  static int	float4_cmp_internal(float4 a, float4 b);
  static int	float8_cmp_internal(float8 a, float8 b);
  
--- 104,111 ----
  int			extra_float_digits = 0;		/* Added to DBL_DIG or FLT_DIG */
  
  
! static void CheckFloat4Val(double val, bool isinf_args);
! static void CheckFloat8Val(double val, bool isinf_args);
  static int	float4_cmp_internal(float4 a, float4 b);
  static int	float8_cmp_internal(float8 a, float8 b);
  
***************
*** 211,219 ****
   * raise an ereport() error if it is
   */
  static void
! CheckFloat4Val(double val)
  {
! 	if (fabs(val) > FLOAT4_MAX)
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("type \"real\" value out of range: overflow")));
--- 211,220 ----
   * raise an ereport() error if it is
   */
  static void
! CheckFloat4Val(double val, bool isinf_args)
  {
! 	/* If one of the input arguments was infinity, allow an infinite result */
! 	if (fabs(val) > FLOAT4_MAX && (!isinf(val) || !isinf_args))
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("type \"real\" value out of range: overflow")));
***************
*** 230,238 ****
   * raise an ereport() error if it is
   */
  static void
! CheckFloat8Val(double val)
  {
! 	if (fabs(val) > FLOAT8_MAX)
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  		  errmsg("type \"double precision\" value out of range: overflow")));
--- 231,240 ----
   * raise an ereport() error if it is
   */
  static void
! CheckFloat8Val(double val, bool isinf_args)
  {
! 	/* If one of the input arguments was infinity, allow an infinite result */
! 	if (fabs(val) > FLOAT8_MAX && (!isinf(val) || !isinf_args))
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  		  errmsg("type \"double precision\" value out of range: overflow")));
***************
*** 369,376 ****
  	 * if we get here, we have a legal double, still need to check to see if
  	 * it's a legal float4
  	 */
! 	if (!isinf(val))
! 		CheckFloat4Val(val);
  
  	PG_RETURN_FLOAT4((float4) val);
  }
--- 371,377 ----
  	 * if we get here, we have a legal double, still need to check to see if
  	 * it's a legal float4
  	 */
! 	CheckFloat4Val(val, true /* allow Inf */);
  
  	PG_RETURN_FLOAT4((float4) val);
  }
***************
*** 558,565 ****
  			 errmsg("invalid input syntax for type double precision: \"%s\"",
  					orig_num)));
  
! 	if (!isinf(val))
! 		CheckFloat8Val(val);
  
  	PG_RETURN_FLOAT8(val);
  }
--- 559,565 ----
  			 errmsg("invalid input syntax for type double precision: \"%s\"",
  					orig_num)));
  
! 	CheckFloat8Val(val, true /* allow Inf */);
  
  	PG_RETURN_FLOAT8(val);
  }
***************
*** 705,716 ****
  float8abs(PG_FUNCTION_ARGS)
  {
  	float8		arg1 = PG_GETARG_FLOAT8(0);
- 	float8		result;
- 
- 	result = fabs(arg1);
  
! 	CheckFloat8Val(result);
! 	PG_RETURN_FLOAT8(result);
  }
  
  
--- 705,712 ----
  float8abs(PG_FUNCTION_ARGS)
  {
  	float8		arg1 = PG_GETARG_FLOAT8(0);
  
! 	PG_RETURN_FLOAT8(fabs(arg1));
  }
  
  
***************
*** 725,731 ****
  
  	result = ((arg1 != 0) ? -(arg1) : arg1);
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 721,727 ----
  
  	result = ((arg1 != 0) ? -(arg1) : arg1);
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 786,792 ****
  	double		result;
  
  	result = arg1 + arg2;
! 	CheckFloat4Val(result);
  	PG_RETURN_FLOAT4((float4) result);
  }
  
--- 782,788 ----
  	double		result;
  
  	result = arg1 + arg2;
! 	CheckFloat4Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT4((float4) result);
  }
  
***************
*** 798,804 ****
  	double		result;
  
  	result = arg1 - arg2;
! 	CheckFloat4Val(result);
  	PG_RETURN_FLOAT4((float4) result);
  }
  
--- 794,800 ----
  	double		result;
  
  	result = arg1 - arg2;
! 	CheckFloat4Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT4((float4) result);
  }
  
***************
*** 810,816 ****
  	double		result;
  
  	result = arg1 * arg2;
! 	CheckFloat4Val(result);
  	PG_RETURN_FLOAT4((float4) result);
  }
  
--- 806,812 ----
  	double		result;
  
  	result = arg1 * arg2;
! 	CheckFloat4Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT4((float4) result);
  }
  
***************
*** 829,835 ****
  	/* Do division in float8, then check for overflow */
  	result = (float8) arg1 / (float8) arg2;
  
! 	CheckFloat4Val(result);
  	PG_RETURN_FLOAT4((float4) result);
  }
  
--- 825,831 ----
  	/* Do division in float8, then check for overflow */
  	result = (float8) arg1 / (float8) arg2;
  
! 	CheckFloat4Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT4((float4) result);
  }
  
***************
*** 848,854 ****
  
  	result = arg1 + arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 844,850 ----
  
  	result = arg1 + arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 861,867 ****
  
  	result = arg1 - arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 857,863 ----
  
  	result = arg1 - arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 874,880 ****
  
  	result = arg1 * arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 870,876 ----
  
  	result = arg1 * arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 892,898 ****
  
  	result = arg1 / arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 888,894 ----
  
  	result = arg1 / arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1142,1148 ****
  {
  	float8		num = PG_GETARG_FLOAT8(0);
  
! 	CheckFloat4Val(num);
  
  	PG_RETURN_FLOAT4((float4) num);
  }
--- 1138,1144 ----
  {
  	float8		num = PG_GETARG_FLOAT8(0);
  
! 	CheckFloat4Val(num, isinf(num));
  
  	PG_RETURN_FLOAT4((float4) num);
  }
***************
*** 1223,1229 ****
  	float4		num = PG_GETARG_FLOAT4(0);
  	int32		result;
  
! 	if (num < INT_MIN || num > INT_MAX)
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("integer out of range")));
--- 1219,1225 ----
  	float4		num = PG_GETARG_FLOAT4(0);
  	int32		result;
  
! 	if (num < INT_MIN || num > INT_MAX || isnan(num))
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("integer out of range")));
***************
*** 1242,1248 ****
  	float4		num = PG_GETARG_FLOAT4(0);
  	int16		result;
  
! 	if (num < SHRT_MIN || num > SHRT_MAX)
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("smallint out of range")));
--- 1238,1244 ----
  	float4		num = PG_GETARG_FLOAT4(0);
  	int16		result;
  
! 	if (num < SHRT_MIN || num > SHRT_MAX || isnan(num))
  		ereport(ERROR,
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("smallint out of range")));
***************
*** 1485,1491 ****
  
  	result = sqrt(arg1);
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1481,1487 ----
  
  	result = sqrt(arg1);
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1539,1545 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("result is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1535,1541 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("result is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1569,1575 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("result is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1565,1571 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("result is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1598,1604 ****
  
  	result = log(arg1);
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1594,1600 ----
  
  	result = log(arg1);
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1628,1634 ****
  
  	result = log10(arg1);
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1624,1630 ----
  
  	result = log10(arg1);
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1653,1659 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1649,1655 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1678,1684 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1674,1680 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1703,1709 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1699,1705 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1729,1735 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1725,1731 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1754,1760 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1750,1756 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1780,1786 ****
  				 errmsg("input is out of range")));
  
  	result = 1.0 / result;
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1776,1782 ----
  				 errmsg("input is out of range")));
  
  	result = 1.0 / result;
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1805,1811 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1801,1807 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1830,1836 ****
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1826,1832 ----
  				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
  				 errmsg("input is out of range")));
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1846,1852 ****
  
  	result = arg1 * (180.0 / M_PI);
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1842,1848 ----
  
  	result = arg1 * (180.0 / M_PI);
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 1872,1878 ****
  
  	result = arg1 * (M_PI / 180.0);
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 1868,1874 ----
  
  	result = arg1 * (M_PI / 180.0);
  
! 	CheckFloat8Val(result, isinf(arg1));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2598,2604 ****
  	float8		result;
  
  	result = arg1 + arg2;
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2594,2600 ----
  	float8		result;
  
  	result = arg1 + arg2;
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2610,2616 ****
  	float8		result;
  
  	result = arg1 - arg2;
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2606,2612 ----
  	float8		result;
  
  	result = arg1 - arg2;
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2622,2628 ****
  	float8		result;
  
  	result = arg1 * arg2;
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2618,2624 ----
  	float8		result;
  
  	result = arg1 * arg2;
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2639,2645 ****
  				 errmsg("division by zero")));
  
  	result = arg1 / arg2;
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2635,2641 ----
  				 errmsg("division by zero")));
  
  	result = arg1 / arg2;
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2658,2664 ****
  
  	result = arg1 + arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2654,2660 ----
  
  	result = arg1 + arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2671,2677 ****
  
  	result = arg1 - arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2667,2673 ----
  
  	result = arg1 - arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2684,2690 ****
  
  	result = arg1 * arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2680,2686 ----
  
  	result = arg1 * arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
***************
*** 2702,2708 ****
  
  	result = arg1 / arg2;
  
! 	CheckFloat8Val(result);
  	PG_RETURN_FLOAT8(result);
  }
  
--- 2698,2704 ----
  
  	result = arg1 / arg2;
  
! 	CheckFloat8Val(result, isinf(arg1) || isinf(arg2));
  	PG_RETURN_FLOAT8(result);
  }
  
Index: src/backend/utils/adt/int.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/adt/int.c,v
retrieving revision 1.75
diff -c -c -r1.75 int.c
*** src/backend/utils/adt/int.c	4 Oct 2006 00:29:59 -0000	1.75
--- src/backend/utils/adt/int.c	24 Dec 2006 06:48:09 -0000
***************
*** 1124,1129 ****
--- 1124,1134 ----
  		ereport(ERROR,
  				(errcode(ERRCODE_DIVISION_BY_ZERO),
  				 errmsg("division by zero")));
+ 
+ 	/* SELECT ((-2147483648)::int4) % (-1); causes a floating point exception */
+ 	if (arg1 == INT_MIN && arg2 == -1)
+ 		PG_RETURN_INT32(0);
+ 
  	/* No overflow is possible */
  
  	PG_RETURN_INT32(arg1 % arg2);