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

Secured sprintf with snprintf

Browse Source
This commit is contained in:
Michiel Broek 2005-08-28 17:08:03 +00:00
parent c4bf4a8315
commit 7cf920c591
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mbmon/mbmon.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Monitor Program * Purpose ...............: Monitor Program
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2004 * Copyright (C) 1997-2005
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -68,9 +68,9 @@ static void die(int onsig)
else else
Syslog(' ', "MBMON Normally finished"); Syslog(' ', "MBMON Normally finished");
sprintf(buf, "CSYS:2,%d,0;", mypid); snprintf(buf, 128, "CSYS:2,%d,0;", mypid);
if (socket_send(buf) == 0) if (socket_send(buf) == 0)
sprintf(buf, "%s", socket_receive()); snprintf(buf, 128, "%s", socket_receive());
ulockprogram((char *)"mbmon"); ulockprogram((char *)"mbmon");
ExitClient(0); ExitClient(0);
} }
@ -99,9 +99,9 @@ void ShowSysinfo(void)
do { do {
show_date(LIGHTGRAY, BLACK, 0, 0); show_date(LIGHTGRAY, BLACK, 0, 0);
set_color(LIGHTGRAY, BLACK); set_color(LIGHTGRAY, BLACK);
sprintf(buf, "GSYS:1,%d;", getpid()); snprintf(buf, 128, "GSYS:1,%d;", getpid());
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
sprintf(buf, "%s", socket_receive()); snprintf(buf, 128, "%s", socket_receive());
if (strncmp(buf, "100:7,", 6) == 0) { if (strncmp(buf, "100:7,", 6) == 0) {
cnt = strtok(buf, ","); cnt = strtok(buf, ",");
mbse_mvprintw( 7,26, "%s", strtok(NULL, ",")); mbse_mvprintw( 7,26, "%s", strtok(NULL, ","));
@ -138,9 +138,9 @@ void ShowLastcaller(void)
do { do {
show_date(LIGHTGRAY, BLACK, 0, 0); show_date(LIGHTGRAY, BLACK, 0, 0);
records = 0; records = 0;
sprintf(buf, "GLCC:0;"); snprintf(buf, 128, "GLCC:0;");
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
sprintf(buf, "%s", socket_receive()); snprintf(buf, 128, "%s", socket_receive());
if (strncmp(buf, "100:1,", 6) == 0) { if (strncmp(buf, "100:1,", 6) == 0) {
cnt = strtok(buf, ","); cnt = strtok(buf, ",");
records = atoi(strtok(NULL, ";")); records = atoi(strtok(NULL, ";"));
@ -155,9 +155,9 @@ void ShowLastcaller(void)
o = 1; o = 1;
set_color(CYAN, BLACK); set_color(CYAN, BLACK);
for (i = o; i <= records; i++) { for (i = o; i <= records; i++) {
sprintf(buf, "GLCR:1,%d;", i); snprintf(buf, 128, "GLCR:1,%d;", i);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
sprintf(buf, "%s", socket_receive()); snprintf(buf, 128, "%s", socket_receive());
if (strncmp(buf, "100:9,", 6) == 0) { if (strncmp(buf, "100:9,", 6) == 0) {
cnt = strtok(buf, ","); cnt = strtok(buf, ",");
mbse_mvprintw(y, 1, "%2d", i); mbse_mvprintw(y, 1, "%2d", i);
@ -204,12 +204,12 @@ void system_moni(void)
for (y = 8; y <= lines - 2; y++) { for (y = 8; y <= lines - 2; y++) {
if (y == 8) if (y == 8)
sprintf(buf, "GMON:1,1;"); snprintf(buf, 128, "GMON:1,1;");
else else
sprintf(buf, "GMON:1,0;"); snprintf(buf, 128, "GMON:1,0;");
if (eof == 0) { if (eof == 0) {
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strncpy(buf, socket_receive(), 128);
mbse_locate(y, 1); mbse_locate(y, 1);
clrtoeol(); clrtoeol();
if (strncmp(buf, "100:0;", 6) == 0) { if (strncmp(buf, "100:0;", 6) == 0) {
@ -283,9 +283,9 @@ void system_stat(void)
do { do {
show_date(LIGHTGRAY, BLACK, 0, 0); show_date(LIGHTGRAY, BLACK, 0, 0);
sprintf(buf, "GSTA:1,%d;", getpid()); snprintf(buf, 256, "GSTA:1,%d;", getpid());
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strncpy(buf, socket_receive(), 256);
set_color(LIGHTGRAY, BLACK); set_color(LIGHTGRAY, BLACK);
cnt = strtok(buf, ","); cnt = strtok(buf, ",");
now = atoi(strtok(NULL, ",")); now = atoi(strtok(NULL, ","));
@ -352,7 +352,7 @@ void disk_stat(void)
do { do {
show_date(LIGHTGRAY, BLACK, 0, 0); show_date(LIGHTGRAY, BLACK, 0, 0);
sprintf(buf, "DGFS:0;"); snprintf(buf, 1024, "DGFS:0;");
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strcpy(buf, socket_receive());
set_color(LIGHTGRAY, BLACK); set_color(LIGHTGRAY, BLACK);
@ -449,12 +449,12 @@ void soft_info(void)
center_addstr(10, (char *)"Made in the Netherlands."); center_addstr(10, (char *)"Made in the Netherlands.");
set_color(WHITE, BLACK); set_color(WHITE, BLACK);
#ifdef __GLIBC__ #ifdef __GLIBC__
sprintf(temp, "Compiled on glibc v%d.%d", __GLIBC__, __GLIBC_MINOR__); snprintf(temp, 81, "Compiled on glibc v%d.%d", __GLIBC__, __GLIBC_MINOR__);
#else #else
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
sprintf(temp, "Compiled on libc v%d", __GNU_LIBRARY__); snprintf(temp, 81, "Compiled on libc v%d", __GNU_LIBRARY__);
#else #else
sprintf(temp, "Compiled on unknown library"); snprintf(temp, 81, "Compiled on unknown library");
#endif #endif
#endif #endif
center_addstr(12, temp); center_addstr(12, temp);
@ -524,7 +524,7 @@ void DispMsg(char *msg)
for (i = 0; i <= rsize; i++) { for (i = 0; i <= rsize; i++) {
mbse_locate(i+4,1); mbse_locate(i+4,1);
clrtoeol(); clrtoeol();
sprintf(rbuf[i], "%s", rbuf[i+1]); snprintf(rbuf[i], 80, "%s", rbuf[i+1]);
Showline(i+4, 1, rbuf[i]); Showline(i+4, 1, rbuf[i]);
} }
} else { } else {
@ -549,7 +549,7 @@ void Chat(int sysop)
rsize = lines - 7; rsize = lines - 7;
rpointer = 0; rpointer = 0;
sprintf(buf, "CCON,4,%d,%s,%s,%s;", mypid, CFG.sysop_name, CFG.sysop, sysop ? "1":"0"); snprintf(buf, 200, "CCON,4,%d,%s,%s,%s;", mypid, CFG.sysop_name, CFG.sysop, sysop ? "1":"0");
Syslog('-', "> %s", buf); Syslog('-', "> %s", buf);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strcpy(buf, socket_receive());
@ -582,7 +582,7 @@ void Chat(int sysop)
/* /*
* Join channel #sysop automatic * Join channel #sysop automatic
*/ */
sprintf(buf, "CPUT:2,%d,/JOIN #sysop;", mypid); snprintf(buf, 200, "CPUT:2,%d,/JOIN #sysop;", mypid);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strcpy(buf, socket_receive());
} }
@ -597,7 +597,7 @@ void Chat(int sysop)
*/ */
data = TRUE; data = TRUE;
while (data) { while (data) {
sprintf(buf, "CGET:1,%d;", mypid); snprintf(buf, 200, "CGET:1,%d;", mypid);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
memset(&buf, 0, sizeof(buf)); memset(&buf, 0, sizeof(buf));
strncpy(buf, socket_receive(), sizeof(buf)-1); strncpy(buf, socket_receive(), sizeof(buf)-1);
@ -655,7 +655,7 @@ void Chat(int sysop)
putchar(7); putchar(7);
} }
} else if ((ch == '\r') && curpos) { } else if ((ch == '\r') && curpos) {
sprintf(buf, "CPUT:2,%d,%s;", mypid, sbuf); snprintf(buf, 200, "CPUT:2,%d,%s;", mypid, sbuf);
Syslog('-', "> %s", buf); Syslog('-', "> %s", buf);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strcpy(buf, socket_receive());
@ -688,7 +688,7 @@ void Chat(int sysop)
*/ */
data = TRUE; data = TRUE;
while (data) { while (data) {
sprintf(buf, "CGET:1,%d;", mypid); snprintf(buf, 200, "CGET:1,%d;", mypid);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strncpy(buf, socket_receive(), sizeof(buf)-1); strncpy(buf, socket_receive(), sizeof(buf)-1);
if (strncmp(buf, "100:2,", 6) == 0) { if (strncmp(buf, "100:2,", 6) == 0) {
@ -715,7 +715,7 @@ void Chat(int sysop)
/* /*
* Close server connection * Close server connection
*/ */
sprintf(buf, "CCLO,1,%d;", mypid); snprintf(buf, 200, "CCLO,1,%d;", mypid);
Syslog('-', "> %s", buf); Syslog('-', "> %s", buf);
if (socket_send(buf) == 0) { if (socket_send(buf) == 0) {
strcpy(buf, socket_receive()); strcpy(buf, socket_receive());
@ -755,9 +755,9 @@ int main(int argc, char *argv[])
/* /*
* Report sysop available for chat * Report sysop available for chat
*/ */
sprintf(buf, "CSYS:2,%d,1;", mypid); snprintf(buf, 128, "CSYS:2,%d,1;", mypid);
if (socket_send(buf) == 0) if (socket_send(buf) == 0)
sprintf(buf, "%s", socket_receive()); snprintf(buf, 128, "%s", socket_receive());
/* /*

6
mbmon/mutil.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Utilities * Purpose ...............: Utilities
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2004 * Copyright (C) 1997-2005
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -139,7 +139,7 @@ char *edit_field(int y, int x, int w, int p, char *s_)
unsigned int ch; unsigned int ch;
memset((char *)s, 0, 256); memset((char *)s, 0, 256);
sprintf(s, "%s", s_); snprintf(s, 256, "%s", s_);
curpos = 0; curpos = 0;
first = 1; first = 1;
newinsert(1, YELLOW, BLUE); newinsert(1, YELLOW, BLUE);
@ -298,7 +298,7 @@ int select_menu(int max)
char help[80]; char help[80];
int pick; int pick;
sprintf(help, "Select menu item (1..%d) or ^\"-\"^ for previous level.", max); snprintf(help, 80, "Select menu item (1..%d) or ^\"-\"^ for previous level.", max);
showhelp(help); showhelp(help);
/* /*

8
mbmon/proglock.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Program Locking * Purpose ...............: Program Locking
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2004 * Copyright (C) 1997-2005
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -47,8 +47,8 @@ int lockprogram(char *progname)
tempfile = calloc(PATH_MAX, sizeof(char)); tempfile = calloc(PATH_MAX, sizeof(char));
lockfile = calloc(PATH_MAX, sizeof(char)); lockfile = calloc(PATH_MAX, sizeof(char));
sprintf(tempfile, "%s/var/run/%s.tmp", getenv("MBSE_ROOT"), progname); snprintf(tempfile, PATH_MAX, "%s/var/run/%s.tmp", getenv("MBSE_ROOT"), progname);
sprintf(lockfile, "%s/var/run/%s", getenv("MBSE_ROOT"), progname); snprintf(lockfile, PATH_MAX, "%s/var/run/%s", getenv("MBSE_ROOT"), progname);
if ((fp = fopen(tempfile, "w")) == NULL) { if ((fp = fopen(tempfile, "w")) == NULL) {
Syslog('?', "$Can't create lockfile \"%s\"", tempfile); Syslog('?', "$Can't create lockfile \"%s\"", tempfile);
@ -113,7 +113,7 @@ void ulockprogram(char *progname)
FILE *fp; FILE *fp;
lockfile = calloc(PATH_MAX, sizeof(char)); lockfile = calloc(PATH_MAX, sizeof(char));
sprintf(lockfile, "%s/var/run/%s", getenv("MBSE_ROOT"), progname); snprintf(lockfile, PATH_MAX, "%s/var/run/%s", getenv("MBSE_ROOT"), progname);
if ((fp = fopen(lockfile, "r")) == NULL) { if ((fp = fopen(lockfile, "r")) == NULL) {
Syslog('?', "$Can't open lockfile \"%s\"", lockfile); Syslog('?', "$Can't open lockfile \"%s\"", lockfile);