Commite2ceff1

committed

postgres: Use pg_{add,mul}_size_overflow()

The backend implementations of add_size() and mul_size() can now makeuse of the APIs provided in common/int.h.Reviewed-by: Chao Li <li.evan.chao@gmail.com>Reviewed-by: Michael Paquier <michael@paquier.xyz>Discussion:https://postgr.es/m/CAOYmi%2B%3D%2BpqUd2MUitvgW1pAJuXgG_TKCVc3_Ek7pe8z9nkf%2BAg%40mail.gmail.com

1 parent8934f21 commite2ceff1Copy full SHA for e2ceff1

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@`
`65`	`65`
`66`	`66`	`#include"postgres.h"`
`67`	`67`
	`68`	`+#include"common/int.h"`
`68`	`69`	`#include"fmgr.h"`
`69`	`70`	`#include"funcapi.h"`
`70`	`71`	`#include"miscadmin.h"`
`@@ -495,9 +496,7 @@ add_size(Size s1, Size s2)`
`495`	`496`	`{`
`496`	`497`	`Sizeresult;`
`497`	`498`
`498`		`-result=s1+s2;`
`499`		`-/* We are assuming Size is an unsigned type here... */`
`500`		`-if (result<s1\|\|result<s2)`
	`499`	`+if (pg_add_size_overflow(s1,s2,&result))`
`501`	`500`	`ereport(ERROR,`
`502`	`501`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`503`	`502`	`errmsg("requested shared memory size overflows size_t")));`
`@@ -512,11 +511,7 @@ mul_size(Size s1, Size s2)`
`512`	`511`	`{`
`513`	`512`	`Sizeresult;`
`514`	`513`
`515`		`-if (s1==0\|\|s2==0)`
`516`		`-return0;`
`517`		`-result=s1*s2;`
`518`		`-/* We are assuming Size is an unsigned type here... */`
`519`		`-if (result /s2!=s1)`
	`514`	`+if (pg_mul_size_overflow(s1,s2,&result))`
`520`	`515`	`ereport(ERROR,`
`521`	`516`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`522`	`517`	`errmsg("requested shared memory size overflows size_t")));`

Comments

(0)