|
 |
f4defd |
diff -up netkit-telnet-0.17/telnetd/utility.c.orig netkit-telnet-0.17/telnetd/utility.c
|
|
|
f4defd |
--- netkit-telnet-0.17/telnetd/utility.c.orig 2020-03-25 11:53:56.772624325 +0100
|
|
|
f4defd |
+++ netkit-telnet-0.17/telnetd/utility.c 2020-03-25 11:54:01.966601415 +0100
|
|
|
f4defd |
@@ -221,31 +221,38 @@ void ptyflush(void)
|
|
|
f4defd |
*/
|
|
|
f4defd |
static
|
|
|
f4defd |
char *
|
|
|
f4defd |
-nextitem(char *current)
|
|
|
f4defd |
+nextitem(char *current, const char *endp)
|
|
|
f4defd |
{
|
|
|
f4defd |
+ if (current >= endp) {
|
|
|
f4defd |
+ return NULL;
|
|
|
f4defd |
+ }
|
|
|
f4defd |
if ((*current&0xff) != IAC) {
|
|
|
f4defd |
return current+1;
|
|
|
f4defd |
}
|
|
|
f4defd |
+ if (current+1 >= endp) {
|
|
|
f4defd |
+ return NULL;
|
|
|
f4defd |
+ }
|
|
|
f4defd |
switch (*(current+1)&0xff) {
|
|
|
f4defd |
case DO:
|
|
|
f4defd |
case DONT:
|
|
|
f4defd |
case WILL:
|
|
|
f4defd |
case WONT:
|
|
|
f4defd |
- return current+3;
|
|
|
f4defd |
+ return current+3 <= endp ? current+3 : NULL;
|
|
|
f4defd |
case SB: /* loop forever looking for the SE */
|
|
|
f4defd |
{
|
|
|
f4defd |
register char *look = current+2;
|
|
|
f4defd |
|
|
|
f4defd |
- for (;;) {
|
|
|
f4defd |
+ while (look < endp) {
|
|
|
f4defd |
if ((*look++&0xff) == IAC) {
|
|
|
f4defd |
- if ((*look++&0xff) == SE) {
|
|
|
f4defd |
+ if (look < endp && (*look++&0xff) == SE) {
|
|
|
f4defd |
return look;
|
|
|
f4defd |
}
|
|
|
f4defd |
}
|
|
|
f4defd |
}
|
|
|
f4defd |
+ return NULL;
|
|
|
f4defd |
}
|
|
|
f4defd |
default:
|
|
|
f4defd |
- return current+2;
|
|
|
f4defd |
+ return current+2 <= endp ? current+2 : NULL;
|
|
|
f4defd |
}
|
|
|
f4defd |
} /* end of nextitem */
|
|
|
f4defd |
|
|
|
f4defd |
@@ -271,7 +278,7 @@ void netclear(void)
|
|
|
f4defd |
register char *thisitem, *next;
|
|
|
f4defd |
char *good;
|
|
|
f4defd |
#define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \
|
|
|
f4defd |
- ((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))
|
|
|
f4defd |
+ (nfrontp > p+1 && (((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL))))
|
|
|
f4defd |
|
|
|
f4defd |
#if defined(ENCRYPT)
|
|
|
f4defd |
thisitem = nclearto > netobuf ? nclearto : netobuf;
|
|
|
f4defd |
@@ -279,7 +286,7 @@ void netclear(void)
|
|
|
f4defd |
thisitem = netobuf;
|
|
|
f4defd |
#endif
|
|
|
f4defd |
|
|
|
f4defd |
- while ((next = nextitem(thisitem)) <= nbackp) {
|
|
|
f4defd |
+ while ((next = nextitem(thisitem, nbackp)) != NULL && next <= nbackp) {
|
|
|
f4defd |
thisitem = next;
|
|
|
f4defd |
}
|
|
|
f4defd |
|
|
|
f4defd |
@@ -291,20 +298,23 @@ void netclear(void)
|
|
|
f4defd |
good = netobuf; /* where the good bytes go */
|
|
|
f4defd |
#endif
|
|
|
f4defd |
|
|
|
f4defd |
- while (nfrontp > thisitem) {
|
|
|
f4defd |
+ while (thisitem != NULL && nfrontp > thisitem) {
|
|
|
f4defd |
if (wewant(thisitem)) {
|
|
|
f4defd |
int length;
|
|
|
f4defd |
|
|
|
f4defd |
next = thisitem;
|
|
|
f4defd |
do {
|
|
|
f4defd |
- next = nextitem(next);
|
|
|
f4defd |
- } while (wewant(next) && (nfrontp > next));
|
|
|
f4defd |
+ next = nextitem(next, nfrontp);
|
|
|
f4defd |
+ } while (next != NULL && wewant(next) && (nfrontp > next));
|
|
|
f4defd |
+ if (next == NULL) {
|
|
|
f4defd |
+ next = nfrontp;
|
|
|
f4defd |
+ }
|
|
|
f4defd |
length = next-thisitem;
|
|
|
f4defd |
bcopy(thisitem, good, length);
|
|
|
f4defd |
good += length;
|
|
|
f4defd |
thisitem = next;
|
|
|
f4defd |
} else {
|
|
|
f4defd |
- thisitem = nextitem(thisitem);
|
|
|
f4defd |
+ thisitem = nextitem(thisitem, nfrontp);
|
|
|
f4defd |
}
|
|
|
f4defd |
}
|