Gentoo Archives: gentoo-commits

From: "Tobias Heinlein (keytoaster)" <keytoaster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-terms/aterm/files: aterm-1.0.1-display-security-issue.patch
Date: Sat, 03 May 2008 12:27:02
Message-Id: E1JsGpP-0005A9-ND@stork.gentoo.org
1 keytoaster 08/05/03 12:26:59
2
3 Added: aterm-1.0.1-display-security-issue.patch
4 Log:
5 Adding patch to fix security bug #219746
6 (Portage version: 2.1.5_rc6)
7
8 Revision Changes Path
9 1.1 x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch?rev=1.1&content-type=text/plain
13
14 Index: aterm-1.0.1-display-security-issue.patch
15 ===================================================================
16 --- aterm-1.0.1/src/main.c 2007-08-01 16:08:29.000000000 +0200
17 +++ aterm-1.0.1.new/src/main.c 2008-05-03 14:06:52.000000000 +0200
18 @@ -2057,10 +2057,6 @@
19 */
20 get_options(argc, argv);
21
22 - if( display_name == NULL )
23 - if ((display_name = getenv("DISPLAY")) == NULL)
24 - display_name = ":0";
25 -
26 #ifdef HAVE_AFTERSTEP
27 #ifdef MyArgs_IS_MACRO
28 MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) );
29 @@ -2102,7 +2098,9 @@
30 Xdisplay = XOpenDisplay(display_name);
31
32 if (!Xdisplay) {
33 - print_error("can't open display %s", display_name);
34 + print_error("can't open display %s", display_name?display_name:
35 + getenv("DISPLAY")?getenv("DISPLAY"):
36 + "as no -d given and DISPLAY not set");
37 exit(EXIT_FAILURE);
38 }
39 /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */
40
41
42
43 --
44 gentoo-commits@l.g.o mailing list