60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
--- contrib/telnet/telnet/commands.c.orig
|
|
+++ contrib/telnet/telnet/commands.c
|
|
@@ -45,6 +45,7 @@
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
|
|
+#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
@@ -1654,11 +1655,14 @@
|
|
|| (strncmp((char *)ep->value, "unix:", 5) == 0))) {
|
|
char hbuf[256+1];
|
|
char *cp2 = strchr((char *)ep->value, ':');
|
|
+ size_t buflen;
|
|
|
|
- gethostname(hbuf, 256);
|
|
- hbuf[256] = '\0';
|
|
- cp = (char *)malloc(strlen(hbuf) + strlen(cp2) + 1);
|
|
- sprintf((char *)cp, "%s%s", hbuf, cp2);
|
|
+ gethostname(hbuf, sizeof(hbuf));
|
|
+ hbuf[sizeof(hbuf)-1] = '\0';
|
|
+ buflen = strlen(hbuf) + strlen(cp2) + 1;
|
|
+ cp = (char *)malloc(sizeof(char)*buflen);
|
|
+ assert(cp != NULL);
|
|
+ snprintf((char *)cp, buflen, "%s%s", hbuf, cp2);
|
|
free(ep->value);
|
|
ep->value = (unsigned char *)cp;
|
|
}
|
|
--- contrib/telnet/telnet/utilities.c.orig
|
|
+++ contrib/telnet/telnet/utilities.c
|
|
@@ -629,7 +629,7 @@
|
|
}
|
|
{
|
|
char tbuf[64];
|
|
- sprintf(tbuf, "%s%s%s%s%s",
|
|
+ snprintf(tbuf, sizeof(tbuf), "%s%s%s%s%s",
|
|
pointer[2]&MODE_EDIT ? "|EDIT" : "",
|
|
pointer[2]&MODE_TRAPSIG ? "|TRAPSIG" : "",
|
|
pointer[2]&MODE_SOFT_TAB ? "|SOFT_TAB" : "",
|
|
--- contrib/telnet/telnet/telnet.c.orig
|
|
+++ contrib/telnet/telnet/telnet.c
|
|
@@ -785,7 +785,7 @@
|
|
name = gettermname();
|
|
len = strlen(name) + 4 + 2;
|
|
if (len < NETROOM()) {
|
|
- sprintf(temp, "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
|
|
+ snprintf(temp, sizeof(temp), "%c%c%c%c%s%c%c", IAC, SB, TELOPT_TTYPE,
|
|
TELQUAL_IS, name, IAC, SE);
|
|
ring_supply_data(&netoring, temp, len);
|
|
printsub('>', &temp[2], len-2);
|
|
@@ -807,7 +807,7 @@
|
|
|
|
TerminalSpeeds(&ispeed, &ospeed);
|
|
|
|
- sprintf((char *)temp, "%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
|
|
+ snprintf((char *)temp, sizeof(temp), "%c%c%c%c%ld,%ld%c%c", IAC, SB, TELOPT_TSPEED,
|
|
TELQUAL_IS, ospeed, ispeed, IAC, SE);
|
|
len = strlen((char *)temp+4) + 4; /* temp[3] is 0 ... */
|
|
|