NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit1d1cf38

Thomas G. Lockhart

committed

Fix max(int8) result by making sure int8larger() copies its result

rather than reusing the input storage.Also made the same fix to int8smaller(), though there wasn't a symptom, and went through and verified that other pass-by-reference data types do the same thing. Not an issue for the by-value types.

1 parent8474600 commit1d1cf38Copy full SHA for 1d1cf38

File tree

1 file changed

-19

lines changed

src/backend/utils/adt
- int8.c

1 file changed

-19

lines changed

`‎src/backend/utils/adt/int8.c`

Lines changed: 2 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,11 +228,7 @@ int8um(int64 *val)`
`228`	`228`	`if (!PointerIsValid(val))`
`229`	`229`	`returnNULL;`
`230`	`230`
`231`		`-#ifNOT_USED`
`232`		`-result=temp- (val);`
`233`		`-#else`
`234`	`231`	`result=int8mi(&temp,val);`
`235`		`-#endif`
`236`	`232`
`237`	`233`	`returnresult;`
`238`	`234`	`}/* int8um() */`
`@@ -293,39 +289,27 @@ int8div(int64 val1, int64 val2)`
`293`	`289`	`int64*`
`294`	`290`	`int8larger(int64val1,int64val2)`
`295`	`291`	`{`
`296`		`-#ifNOT_USED`
`297`	`292`	`int64*result=palloc(sizeof(int64));`
`298`	`293`
`299`		`-#endif`
`300`		`-`
`301`	`294`	`if ((!PointerIsValid(val1))\|\| (!PointerIsValid(val2)))`
`302`	`295`	`returnNULL;`
`303`	`296`
`304`		`-#ifNOT_USED`
`305`	`297`	`result= ((val1>val2) ?val1 :*val2);`
`306`	`298`
`307`	`299`	`returnresult;`
`308`		`-#endif`
`309`		`-return (val1>val2) ?val1 :val2;`
`310`	`300`	`}/* int8larger() */`
`311`	`301`
`312`	`302`	`int64*`
`313`	`303`	`int8smaller(int64val1,int64val2)`
`314`	`304`	`{`
`315`		`-#ifNOT_USED`
`316`	`305`	`int64*result=palloc(sizeof(int64));`
`317`	`306`
`318`		`-#endif`
`319`		`-`
`320`	`307`	`if ((!PointerIsValid(val1))\|\| (!PointerIsValid(val2)))`
`321`	`308`	`returnNULL;`
`322`	`309`
`323`		`-#ifNOT_USED`
`324`	`310`	`result= ((val1<val2) ?val1 :*val2);`
`325`	`311`
`326`	`312`	`returnresult;`
`327`		`-#endif`
`328`		`-return (val1<val2) ?val1 :val2;`
`329`	`313`	`}/* int8smaller() */`
`330`	`314`
`331`	`315`
`@@ -458,16 +442,15 @@ int84(int64 *val)`
`458`	`442`	`elog(ERROR,"Invalid (null) int64, can't convert int8 to int4",NULL);`
`459`	`443`
`460`	`444`	`#ifNOT_USED`
`461`		`-`
`462`	`445`	`/*`
`463`	`446`	`* Hmm. This conditional always tests true on my i686/linux box. It's`
`464`	`447`	`* a gcc compiler bug, or I'm missing something obvious, which is more`
`465`	`448`	`* likely... - thomas 1998-06-09`
`466`	`449`	`*/`
`467`	`450`	`if ((val<INT_MIN)\|\| (val>INT_MAX))`
`468`	`451`	`#endif`
`469`		`-if ((val< (-pow(2,31)+1))\|\| (val> (pow(2,31)-1)))`
`470`		`-elog(ERROR,"int8 conversion to int4 is out of range",NULL);`
	`452`	`+if ((val< (-pow(2,31)+1))\|\| (val> (pow(2,31)-1)))`
	`453`	`+elog(ERROR,"int8 conversion to int4 is out of range",NULL);`
`471`	`454`
`472`	`455`	`result=*val;`
`473`	`456`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1d1cf38

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/int8.c`

0 commit comments