database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Fix for tprintf overruns from Göran Thyni.

Browse Source
This commit is contained in:
Bruce Momjian
1998-10-27 03:26:48 +00:00
parent ccbe540b61
commit 7825f9b890
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/misc/trace.c
View File

@ -108,7 +108,8 @@ tprintf(int flag, const char *fmt,...)
#ifdef ELOG_TIMESTAMPS #ifdef ELOG_TIMESTAMPS
strcpy(line, tprintf_timestamp()); strcpy(line, tprintf_timestamp());
#endif #endif
vsprintf(line + TIMESTAMP_SIZE, fmt, ap); vsnprintf(line + TIMESTAMP_SIZE, ELOG_MAXLEN,
fmt, ap);
va_end(ap); va_end(ap);
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
@ -138,7 +139,8 @@ tprintf1(const char *fmt, ... )
#ifdef ELOG_TIMESTAMPS #ifdef ELOG_TIMESTAMPS
strcpy(line, tprintf_timestamp()); strcpy(line, tprintf_timestamp());
#endif #endif
vsprintf(line+TIMESTAMP_SIZE, fmt, ap); vsnprintf(line+TIMESTAMP_SIZE, ELOG_MAXLEN,
fmt, ap);
va_end(ap); va_end(ap);
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
@ -166,7 +168,8 @@ eprintf(const char *fmt,...)
#ifdef ELOG_TIMESTAMPS #ifdef ELOG_TIMESTAMPS
strcpy(line, tprintf_timestamp()); strcpy(line, tprintf_timestamp());
#endif #endif
vsprintf(line + TIMESTAMP_SIZE, fmt, ap); vsnprintf(line + TIMESTAMP_SIZE, ELOG_MAXLEN,
fmt, ap);
va_end(ap); va_end(ap);
#ifdef USE_SYSLOG #ifdef USE_SYSLOG
@ -344,7 +347,8 @@ read_pg_options(SIGNAL_ARGS)
return; return;
} }
sprintf(buffer, "%s/%s", DataDir, "pg_options"); snprintf(buffer, BUF_SIZE - 1,
"%s/%s", DataDir, "pg_options");
if ((fd = open(buffer, O_RDONLY)) < 0) if ((fd = open(buffer, O_RDONLY)) < 0)
return; return;