Attachment 39580 Details for Bug 91593

[patch] overflow.patch

overflow.patch (text/plain), 2.84 KB, created by Marcus Meissner on 2005-06-21 14:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-06-21 14:30:11 UTC

Size: 2.84 KB

patch

obsolete

>diff -pru heimdal-0.6.4/appl/telnet/telnetd/ext.h heimdal-0.6.5/appl/telnet/telnetd/ext.h
>--- heimdal-0.6.4/appl/telnet/telnetd/ext.h	2005-04-18 22:53:17.000000000 +0200
>+++ heimdal-0.6.5/appl/telnet/telnetd/ext.h	2005-06-14 16:27:23.000000000 +0200
>@@ -57,7 +57,7 @@ extern const char *new_login;
> 
> extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
> 
>-extern char	*terminaltype;
>+extern char	terminaltype[41];
> 
> /*
>  * I/O data buffers, pointers, and counters.
>diff -pru heimdal-0.6.4/appl/telnet/telnetd/global.c heimdal-0.6.5/appl/telnet/telnetd/global.c
>--- heimdal-0.6.4/appl/telnet/telnetd/global.c	2005-04-18 22:53:17.000000000 +0200
>+++ heimdal-0.6.5/appl/telnet/telnetd/global.c	2005-06-14 16:27:23.000000000 +0200
>@@ -54,7 +54,7 @@ int	require_otp;
> 
> slcfun	slctab[NSLC + 1];	/* slc mapping table */
> 
>-char	*terminaltype;
>+char	terminaltype[41];
> 
> /*
>  * I/O data buffers, pointers, and counters.
>diff -pru heimdal-0.6.4/appl/telnet/telnetd/state.c heimdal-0.6.5/appl/telnet/telnetd/state.c
>--- heimdal-0.6.4/appl/telnet/telnetd/state.c	2005-04-18 22:53:17.000000000 +0200
>+++ heimdal-0.6.5/appl/telnet/telnetd/state.c	2005-06-14 16:27:23.000000000 +0200
>@@ -939,7 +939,7 @@ suboption(void)
>     }  /* end of case TELOPT_TSPEED */
> 
>     case TELOPT_TTYPE: {		/* Yaaaay! */
>-	static char terminalname[41];
>+	char *p;
> 
> 	if (his_state_is_wont(TELOPT_TTYPE))	/* Ignore if option disabled */
> 	    break;
>@@ -949,9 +949,9 @@ suboption(void)
> 	    return;		/* ??? XXX but, this is the most robust */
> 	}
> 
>-	terminaltype = terminalname;
>+	p = terminaltype;
> 
>-	while ((terminaltype < (terminalname + sizeof terminalname-1)) &&
>+	while ((p < (terminaltype + sizeof terminaltype-1)) &&
> 	       !SB_EOF()) {
> 	    int c;
> 
>@@ -959,10 +959,9 @@ suboption(void)
> 	    if (isupper(c)) {
> 		c = tolower(c);
> 	    }
>-	    *terminaltype++ = c;    /* accumulate name */
>+	    *p++ = c;    /* accumulate name */
> 	}
>-	*terminaltype = 0;
>-	terminaltype = terminalname;
>+	*p = 0;
> 	break;
>     }  /* end of case TELOPT_TTYPE */
> 
>diff -pru heimdal-0.6.4/appl/telnet/telnetd/telnetd.c heimdal-0.6.5/appl/telnet/telnetd/telnetd.c
>--- heimdal-0.6.4/appl/telnet/telnetd/telnetd.c	2005-04-18 22:53:18.000000000 +0200
>+++ heimdal-0.6.5/appl/telnet/telnetd/telnetd.c	2005-06-14 16:27:23.000000000 +0200
>@@ -636,7 +636,7 @@ getterminaltype(char *name, size_t name_
> 		     */
> 		    _gettermname();
> 		    if (strncmp(first, terminaltype, sizeof(first)) != 0)
>-			strcpy(terminaltype, first);
>+			strlcpy(terminaltype, first, sizeof(terminaltype));
> 		    break;
> 		}
> 	    }
>@@ -752,7 +752,7 @@ Please contact your net administrator");
>      */
>     *user_name = 0;
>     level = getterminaltype(user_name, sizeof(user_name));
>-    esetenv("TERM", terminaltype ? terminaltype : "network", 1);
>+    esetenv("TERM", terminaltype[0] ? terminaltype : "network", 1);
> 
> #ifdef _SC_CRAY_SECURE_SYS
>     if (secflag) {

Actions: View | Diff

Attachments on bug 91593: 39580 | 41141