diff options
| author | tonnerre <tonnerre> | 2008-05-27 21:46:53 +0000 |
|---|---|---|
| committer | tonnerre <tonnerre> | 2008-05-27 21:46:53 +0000 |
| commit | 87d7671d263b89e0315490895887a2e95b8cc2cb (patch) | |
| tree | be4bca4fa6c7cb8e6e50bb2673b2463392254aa1 /x11/aterm/patches | |
| parent | 5a2d71601e18008a140dd0daccdff83584923a2d (diff) | |
| download | pkgsrc-87d7671d263b89e0315490895887a2e95b8cc2cb.tar.gz | |
Don't make any assumptions about default displays in aterm.
Fixes CVE-2008-1142.
Diffstat (limited to 'x11/aterm/patches')
| -rw-r--r-- | x11/aterm/patches/patch-aa | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/x11/aterm/patches/patch-aa b/x11/aterm/patches/patch-aa index d6bd21889bb..21c2d1d92f9 100644 --- a/x11/aterm/patches/patch-aa +++ b/x11/aterm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2006/12/11 12:23:24 sketch Exp $ +$NetBSD: patch-aa,v 1.5 2008/05/27 21:46:53 tonnerre Exp $ ---- src/main.c.orig 2006-12-11 12:19:55.000000000 +0000 -+++ src/main.c 2006-12-11 12:20:28.000000000 +0000 -@@ -1037,12 +1037,10 @@ +--- src/main.c.orig 2005-06-20 18:10:19.000000000 +0200 ++++ src/main.c +@@ -1037,12 +1037,10 @@ resize_window(XEvent* ev) XConfigureEvent *xconf = &(ev->xconfigure); while( XCheckTypedWindowEvent( Xdisplay, TermWin.parent, ConfigureNotify, ev ) ); @@ -15,3 +15,21 @@ $NetBSD: patch-aa,v 1.4 2006/12/11 12:23:24 sketch Exp $ TermWin.root_x = root_x ; TermWin.root_y = root_y ; TermWin.root_width = xconf->width ; +@@ -2047,9 +2045,14 @@ main(int argc, char *argv[]) + */ + get_options(argc, argv); + +- if( display_name == NULL ) +- if ((display_name = getenv("DISPLAY")) == NULL) +- display_name = ":0"; ++ if( display_name == NULL ) ++ display_name = getenv("DISPLAY"); ++ ++ if( display_name == NULL ) ++ { ++ print_error("DISPLAY variable not set and none given"); ++ exit(EXIT_FAILURE); ++ } + + #ifdef HAVE_AFTERSTEP + #ifdef MyArgs_IS_MACRO |