Commit7825f9b

committed

Fix for tprintf overruns from Göran Thyni.

1 parentccbe540 commit7825f9bCopy full SHA for 7825f9b

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ tprintf(int flag, const char *fmt,...)`
`108`	`108`	`#ifdefELOG_TIMESTAMPS`
`109`	`109`	`strcpy(line,tprintf_timestamp());`
`110`	`110`	`#endif`
`111`		`-vsprintf(line+TIMESTAMP_SIZE,fmt,ap);`
	`111`	`+vsnprintf(line+TIMESTAMP_SIZE,ELOG_MAXLEN,`
	`112`	`+fmt,ap);`
`112`	`113`	`va_end(ap);`
`113`	`114`
`114`	`115`	`#ifdefUSE_SYSLOG`
`@@ -138,7 +139,8 @@ tprintf1(const char *fmt, ... )`
`138`	`139`	`#ifdefELOG_TIMESTAMPS`
`139`	`140`	`strcpy(line,tprintf_timestamp());`
`140`	`141`	`#endif`
`141`		`-vsprintf(line+TIMESTAMP_SIZE,fmt,ap);`
	`142`	`+vsnprintf(line+TIMESTAMP_SIZE,ELOG_MAXLEN,`
	`143`	`+fmt,ap);`
`142`	`144`	`va_end(ap);`
`143`	`145`
`144`	`146`	`#ifdefUSE_SYSLOG`
`@@ -166,7 +168,8 @@ eprintf(const char *fmt,...)`
`166`	`168`	`#ifdefELOG_TIMESTAMPS`
`167`	`169`	`strcpy(line,tprintf_timestamp());`
`168`	`170`	`#endif`
`169`		`-vsprintf(line+TIMESTAMP_SIZE,fmt,ap);`
	`171`	`+vsnprintf(line+TIMESTAMP_SIZE,ELOG_MAXLEN,`
	`172`	`+fmt,ap);`
`170`	`173`	`va_end(ap);`
`171`	`174`
`172`	`175`	`#ifdefUSE_SYSLOG`
`@@ -344,7 +347,8 @@ read_pg_options(SIGNAL_ARGS)`
`344`	`347`	`return;`
`345`	`348`	`}`
`346`	`349`
`347`		`-sprintf(buffer,"%s/%s",DataDir,"pg_options");`
	`350`	`+snprintf(buffer,BUF_SIZE-1,`
	`351`	`+"%s/%s",DataDir,"pg_options");`
`348`	`352`	`if ((fd=open(buffer,O_RDONLY))<0)`
`349`	`353`	`return;`
`350`	`354`

Comments

(0)