Check for NUMERIC overflow a second time after rounding

Jan Wieck · Jan Wieck · commit bb885dd1a1bc · 1999-05-10T18:17:44.000Z
Jan
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
@@ -5,7 +5,7 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.12 1999/05/04 15:50:24 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.13 1999/05/10 18:17:44 wieck Exp $
  *
  * ----------
  */
@@ -2399,6 +2399,19 @@ apply_typmod(NumericVar *var, int32 typmod)
 		var->ndigits = MAX(0, MIN(i, var->ndigits));
 	}
 
+	/* ----------
+	 * Check for overflow again - rounding could have raised the
+	 * weight.
+	 * ----------
+	 */
+	if (var->weight >= maxweight)
+	{
+		free_allvars();
+		elog(ERROR, "overflow on numeric "
+        "ABS(value) >= 10^%d for field with precision %d scale %d",
+							var->weight, precision, scale);
+	}
+
 	var->rscale = scale;
 	var->dscale = scale;
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* 1998 Jan Wieck`
`7`	`7`	`*`
`8`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.12 1999/05/04 15:50:24 thomas Exp $`
	`8`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.13 1999/05/10 18:17:44 wieck Exp $`
`9`	`9`	`*`
`10`	`10`	`* ----------`
`11`	`11`	`*/`
`@@ -2399,6 +2399,19 @@ apply_typmod(NumericVar *var, int32 typmod)`
`2399`	`2399`	`var->ndigits = MAX(0, MIN(i, var->ndigits));`
`2400`	`2400`	`}`
`2401`	`2401`
	`2402`	`+ /* ----------`
	`2403`	`+ * Check for overflow again - rounding could have raised the`
	`2404`	`+ * weight.`
	`2405`	`+ * ----------`
	`2406`	`+ */`
	`2407`	`+ if (var->weight >= maxweight)`
	`2408`	`+ {`
	`2409`	`+ free_allvars();`
	`2410`	`+ elog(ERROR, "overflow on numeric "`
	`2411`	`+ "ABS(value) >= 10^%d for field with precision %d scale %d",`
	`2412`	`+ var->weight, precision, scale);`
	`2413`	`+ }`
	`2414`	`+`
`2402`	`2415`	`var->rscale = scale;`
`2403`	`2416`	`var->dscale = scale;`
`2404`	`2417`	`}`