database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-14 08:21:07 +03:00
Code Activity

Fix int8mul so that overflow check is applied correctly for INT64_IS_BUSTED

Browse Source 
case, per Florian Pflug.
Not back-patched since it's unclear that anyone but me still cares ...
This commit is contained in:
Tom Lane
2007-08-30 05:27:29 +00:00
parent c9bfabe24d
commit e75d365633
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/utils/adt/int8.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.66 2007/06/05 21:31:06 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.67 2007/08/30 05:27:29 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -575,15 +575,19 @@ int8mul(PG_FUNCTION_ARGS)
* Since the division is likely much more expensive than the actual * Since the division is likely much more expensive than the actual
* multiplication, we'd like to skip it where possible. The best bang for * multiplication, we'd like to skip it where possible. The best bang for
* the buck seems to be to check whether both inputs are in the int32 * the buck seems to be to check whether both inputs are in the int32
* range; if so, no overflow is possible. * range; if so, no overflow is possible. (But that only works if we
* really have a 64-bit int64 datatype...)
*/ */
if (!(arg1 == (int64) ((int32) arg1) && #ifndef INT64_IS_BUSTED
arg2 == (int64) ((int32) arg2)) && if (arg1 != (int64) ((int32) arg1) || arg2 != (int64) ((int32) arg2))
arg2 != 0 && #endif
(result / arg2 != arg1 || (arg2 == -1 && arg1 < 0 && result < 0))) {
ereport(ERROR, if (arg2 != 0 &&
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), (result / arg2 != arg1 || (arg2 == -1 && arg1 < 0 && result < 0)))
errmsg("bigint out of range"))); ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("bigint out of range")));
}
PG_RETURN_INT64(result); PG_RETURN_INT64(result);
} }