From: | "Rene Nussbaumer (killerfox)" <killerfox@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-terms/rxvt-unicode/files: rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch |
Date: | Sun, 04 May 2008 18:44:33 |
Message-Id: | E1JsjCJ-0004hE-5N@stork.gentoo.org |
1 | killerfox 08/05/04 18:44:31 |
2 | |
3 | Added: rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch |
4 | Log: |
5 | Fix CVE-2008-1142 |
6 | (Portage version: 2.1.4.4) |
7 | |
8 | Revision Changes Path |
9 | 1.1 x11-terms/rxvt-unicode/files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/rxvt-unicode/files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-terms/rxvt-unicode/files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch |
15 | =================================================================== |
16 | diff -urN rxvt-unicode-9.02.orig/src/init.C rxvt-unicode-9.02/src/init.C |
17 | --- rxvt-unicode-9.02.orig/src/init.C 2008-05-04 20:16:26.000000000 +0200 |
18 | +++ rxvt-unicode-9.02/src/init.C 2008-05-04 20:24:14.000000000 +0200 |
19 | @@ -372,15 +372,16 @@ |
20 | * Open display, get options/resources and create the window |
21 | */ |
22 | |
23 | - if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
24 | - rs[Rs_display_name] = ":0"; |
25 | + rs[Rs_display_name] = getenv ("DISPLAY"); |
26 | |
27 | get_options (r_argc, r_argv); |
28 | |
29 | - if (!(display = displays.get (rs[Rs_display_name]))) |
30 | + if (!rs[Rs_display_name] || !(display = displays.get (rs[Rs_display_name]))) |
31 | { |
32 | free (r_argv); |
33 | - rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
34 | + rxvt_fatal ("can't open display %s, aborting.\n", |
35 | + (rs[Rs_display_name] ? rs[Rs_display_name] : |
36 | + "as no -display option given and DISPLAY not set")); |
37 | } |
38 | |
39 | // using a local pointer decreases code size a lot |
40 | |
41 | |
42 | |
43 | -- |
44 | gentoo-commits@l.g.o mailing list |