old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tue Jun 10 12:19:00 2003 Michael Jennings (mej) 

Patch from Matt Zimmerman <mdz@debian.org> to correct buffer overflow
when $ETERMPATH is set too large.


SVN revision: 7007
This commit is contained in:
Michael Jennings 2003-06-10 16:20:01 +00:00
parent 5d112d314e
commit c86990d93a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5051,3 +5051,8 @@ Mon May 12 22:07:45 2003 Michael Jennings (mej)
Use icon window instead of icon pixmap only if strict ICCCM compliance
is requested via ./configure --enable-strict-icccm
----------------------------------------------------------------------
Tue Jun 10 12:19:00 2003 Michael Jennings (mej)
Patch from Matt Zimmerman <mdz@debian.org> to correct buffer overflow
when $ETERMPATH is set too large.
----------------------------------------------------------------------

2
src/netdisp.c
View File

@ -94,7 +94,7 @@ network_display(const char *display)
struct ifreq ifr2;
strcpy(ifr2.ifr_name, ifr->ifr_name);
snprintf(ifr2.ifr_name, sizeof(ifr2.ifr_name), ifr->ifr_name);
if (ioctl(skfd, SIOCGIFADDR, &ifr2) >= 0) {
unsigned long addr;
struct sockaddr_in *p_addr;

6
src/options.c
View File

@ -2414,10 +2414,10 @@ conf_parse_theme(char **theme, char *conf_name, unsigned char fallback)
path_env = getenv(PATH_ENV);
if (path_env) {
strcpy(path, CONFIG_SEARCH_PATH ":");
strcat(path, path_env);
snprintf(path, sizeof(path), "%s:%s", CONFIG_SEARCH_PATH,
path_env);
} else {
strcpy(path, CONFIG_SEARCH_PATH);
snprintf(path, sizeof(path), CONFIG_SEARCH_PATH);
}
shell_expand(path);
}