NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit0645dac

committed

Fix unsafe assumption that struct timeval.tv_sec is a "long".

It typically is a "long", but it seems possible that on some platformsit wouldn't be. In any case, this silences a compiler warning onOpenBSD (cf buildfarm member curculio).While at it, use snprintf not sprintf. This format string couldn'tpossibly overrun the supplied buffer, but that doesn't seem likea good reason not to use the safer style.Oversight in commitf828654. Back-patch to 9.6 where that came in.

1 parentc648f05 commit0645dacCopy full SHA for 0645dac

File tree

1 file changed

-2

lines changed

src/backend/utils/error
- elog.c

1 file changed

-2

lines changed

`‎src/backend/utils/error/elog.c`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2484,8 +2484,9 @@ log_line_prefix(StringInfo buf, ErrorData *edata)`
`2484`	`2484`	`saved_timeval_set= true;`
`2485`	`2485`	`}`
`2486`	`2486`
`2487`		`-sprintf(strfbuf,"%ld.%03d",saved_timeval.tv_sec,`
`2488`		`-(int) (saved_timeval.tv_usec /1000));`
	`2487`	`+snprintf(strfbuf,sizeof(strfbuf),"%ld.%03d",`
	`2488`	`+ (long)saved_timeval.tv_sec,`
	`2489`	`+ (int) (saved_timeval.tv_usec /1000));`
`2489`	`2490`
`2490`	`2491`	`if (padding!=0)`
`2491`	`2492`	`appendStringInfo(buf,"%*s",padding,strfbuf);`

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!

Commit0645dac

File tree

1 file changed

1 file changed

`‎src/backend/utils/error/elog.c`

0 commit comments