bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Secured vsprintf into vsnprintf

Browse Source
This commit is contained in:
Michiel Broek 2005-08-27 17:50:28 +00:00
parent a7fbf0de1e
commit b8c6dd296c
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/charset.c
View File

@ -65,7 +65,7 @@ int str_printf(char *buf, size_t len, const char *fmt, ...)
va_start(args, fmt); va_start(args, fmt);
n = vsprintf(buf, fmt, args); n = vsnprintf(buf, len, fmt, args);
if (n >= len) { if (n >= len) {
WriteError("Internal error - str_printf() buf overflow"); WriteError("Internal error - str_printf() buf overflow");
/**NOT REACHED**/ /**NOT REACHED**/

13
lib/clcomm.c
View File

@ -156,7 +156,7 @@ void SockS(const char *format, ...)
out = calloc(SS_BUFSIZE, sizeof(char)); out = calloc(SS_BUFSIZE, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(out, format, va_ptr); vsnprintf(out, SS_BUFSIZE -1, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
if (socket_send(out) == 0) if (socket_send(out) == 0)
@ -177,7 +177,7 @@ char *SockR(const char *format, ...)
out = calloc(SS_BUFSIZE, sizeof(char)); out = calloc(SS_BUFSIZE, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(out, format, va_ptr); vsnprintf(out, SS_BUFSIZE -1, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
if (socket_send(out) == 0) if (socket_send(out) == 0)
@ -198,7 +198,8 @@ void WriteError(const char *format, ...)
outputstr = calloc(10240, sizeof(char)); outputstr = calloc(10240, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(outputstr, format, va_ptr); vsnprintf(outputstr, 10239, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
for (i = 0; i < strlen(outputstr); i++) for (i = 0; i < strlen(outputstr); i++)
@ -247,7 +248,7 @@ void Syslog(int level, const char *format, ...)
outstr = calloc(10240, sizeof(char)); outstr = calloc(10240, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(outstr, format, va_ptr); vsnprintf(outstr, 10239, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
Syslogp(level, outstr); Syslogp(level, outstr);
free(outstr); free(outstr);
@ -347,7 +348,7 @@ void Mgrlog(const char *format, ...)
outstr = calloc(10240, sizeof(char)); outstr = calloc(10240, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(outstr, format, va_ptr); vsnprintf(outstr, 10239, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
for (i = 0; i < strlen(outstr); i++) for (i = 0; i < strlen(outstr); i++)
@ -371,7 +372,7 @@ void IsDoing(const char *format, ...)
outputstr = calloc(SS_BUFSIZE, sizeof(char)); outputstr = calloc(SS_BUFSIZE, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(outputstr, format, va_ptr); vsnprintf(outputstr, SS_BUFSIZE -1, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
SockS("ADOI:2,%d,%s;", mypid, outputstr); SockS("ADOI:2,%d,%s;", mypid, outputstr);

2
lib/diesel.c
View File

@ -739,7 +739,7 @@ Mfunc(f_edtime)
{ {
double val; double val;
Dsarg(pic); Dsarg(pic);
long ltime; time_t ltime;
struct tm *jd; struct tm *jd;
char *pp = pic; char *pp = pic;

2
lib/term.c
View File

@ -141,7 +141,7 @@ void mbse_mvprintw(int y, int x, const char *format, ...)
outputstr = calloc(2048, sizeof(char)); outputstr = calloc(2048, sizeof(char));
va_start(va_ptr, format); va_start(va_ptr, format);
vsprintf(outputstr, format, va_ptr); vsnprintf(outputstr, 2047, format, va_ptr);
va_end(va_ptr); va_end(va_ptr);
mbse_locate(y, x); mbse_locate(y, x);