Commitf23a9b8

committed

Fix numeric_mul() overflow due to too many digits after decimal point.

This fixes an overflow error when using the numeric * operator if theresult has more than 16383 digits after the decimal point by roundingthe result. Overflow errors should only occur if the result has toomany digits *before* the decimal point.Discussion:https://postgr.es/m/CAEZATCUmeFWCrq2dNzZpRj5+6LfN85jYiDoqm+ucSXhb9U2TbA@mail.gmail.com

1 parent32d0bdb commitf23a9b8Copy full SHA for f23a9b8

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ struct NumericData`
`205`	`205`	`*/`
`206`	`206`
`207`	`207`	`#defineNUMERIC_DSCALE_MASK0x3FFF`
	`208`	`+#defineNUMERIC_DSCALE_MAXNUMERIC_DSCALE_MASK`
`208`	`209`
`209`	`210`	`#defineNUMERIC_SIGN(n) \`
`210`	`211`	`(NUMERIC_IS_SHORT(n) ? \`
`@@ -2549,14 +2550,21 @@ numeric_mul_opt_error(Numeric num1, Numeric num2, bool *have_error)`
`2549`	`2550`	`* Unlike add_var() and sub_var(), mul_var() will round its result. In the`
`2550`	`2551`	`* case of numeric_mul(), which is invoked for the * operator on numerics,`
`2551`	`2552`	`* we request exact representation for the product (rscale = sum(dscale of`
`2552`		`- * arg1, dscale of arg2)).`
	`2553`	`+ * arg1, dscale of arg2)). If the exact result has more digits after the`
	`2554`	`+ * decimal point than can be stored in a numeric, we round it. Rounding`
	`2555`	`+ * after computing the exact result ensures that the final result is`
	`2556`	`+ * correctly rounded (rounding in mul_var() using a truncated product`
	`2557`	`+ * would not guarantee this).`
`2553`	`2558`	`*/`
`2554`	`2559`	`init_var_from_num(num1,&arg1);`
`2555`	`2560`	`init_var_from_num(num2,&arg2);`
`2556`	`2561`
`2557`	`2562`	`init_var(&result);`
`2558`	`2563`	`mul_var(&arg1,&arg2,&result,arg1.dscale+arg2.dscale);`
`2559`	`2564`
	`2565`	`+if (result.dscale>NUMERIC_DSCALE_MAX)`
	`2566`	`+round_var(&result,NUMERIC_DSCALE_MAX);`
	`2567`	`+`
`2560`	`2568`	`res=make_result_opt_error(&result,have_error);`
`2561`	`2569`
`2562`	`2570`	`free_var(&result);`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1498,6 +1498,12 @@ select 4769999999999999999999999999999999999999999999999999999999999999999999999`
`1498`	`1498`	`47699999999999999999999999999999999999999999999999999999999999999999999999999999999999985230000000000000000000000000000000000000000000000000000000000000000000000000000000000001`
`1499`	`1499`	`(1 row)`
`1500`	`1500`
	`1501`	`+select trim_scale((0.1 - 2e-16383) * (0.1 - 3e-16383));`
	`1502`	`+ trim_scale`
	`1503`	`+------------`
	`1504`	`+ 0.01`
	`1505`	`+(1 row)`
	`1506`	`+`
`1501`	`1507`	`--`
`1502`	`1508`	`-- Test some corner cases for division`
`1503`	`1509`	`--`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -864,6 +864,8 @@ select 4770999999999999999999999999999999999999999999999999999999999999999999999`
`864`	`864`
`865`	`865`	`select4769999999999999999999999999999999999999999999999999999999999999999999999999999999999999*9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999;`
`866`	`866`
	`867`	`+select trim_scale((0.1- 2e-16383)* (0.1- 3e-16383));`
	`868`	`+`
`867`	`869`	`--`
`868`	`870`	`-- Test some corner cases for division`
`869`	`871`	`--`

Comments

(0)