NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf1be740

committed

Fix portability and safety issues in pqTraceFormatTimestamp.

Remove confusion between time_t and pg_time_t; neithergettimeofday() nor localtime() deal in the latter.libpq indeed has no business using <pgtime.h> at all.Use snprintf not sprintf, to ensure we can't overrun thesupplied buffer. (Unlikely, but let's be safe.)Per buildfarm.

1 parent8998e3c commitf1be740Copy full SHA for f1be740

File tree

1 file changed

-6

lines changed

src/interfaces/libpq
- fe-trace.c

1 file changed

-6

lines changed

`‎src/interfaces/libpq/fe-trace.c`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`#include"libpq-fe.h"`
`28`	`28`	`#include"libpq-int.h"`
`29`		`-#include"pgtime.h"`
`30`	`29`	`#include"port/pg_bswap.h"`
`31`	`30`
`32`	`31`	`/* Enable tracing */`
`@@ -81,16 +80,14 @@ static void`
`81`	`80`	`pqTraceFormatTimestamp(char*timestr,size_tts_len)`
`82`	`81`	`{`
`83`	`82`	`structtimevaltval;`
`84`		`-pg_time_tstamp_time;`
`85`	`83`
`86`	`84`	`gettimeofday(&tval,NULL);`
`87`		`-stamp_time= (pg_time_t)tval.tv_sec;`
`88`		`-`
`89`	`85`	`strftime(timestr,ts_len,`
`90`	`86`	`"%Y-%m-%d %H:%M:%S",`
`91`		`-localtime(&stamp_time));`
	`87`	`+localtime(&tval.tv_sec));`
`92`	`88`	`/* append microseconds */`
`93`		`-sprintf(timestr+strlen(timestr),".%06d", (int) (tval.tv_usec));`
	`89`	`+snprintf(timestr+strlen(timestr),ts_len-strlen(timestr),`
	`90`	`+".%06u", (unsignedint) (tval.tv_usec));`
`94`	`91`	`}`
`95`	`92`
`96`	`93`	`/*`

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!

Commitf1be740

File tree

1 file changed

1 file changed

`‎src/interfaces/libpq/fe-trace.c`

0 commit comments