diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-09 16:53:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-09 16:53:27 +0000 |
| commit | 80208fb578cf92cc308906660ca6d7860c6b2a1f (patch) | |
| tree | 6f06818031b553c506fc10dfe9908a835df288aa /x11-base/xorg-server/files | |
| parent | 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff) | |
gentoo resync : 09.03.2018
Diffstat (limited to 'x11-base/xorg-server/files')
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch new file mode 100644 index 000000000000..bcaaf867c7a7 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.19.99.901-randr-fix-crash.patch @@ -0,0 +1,44 @@ +From 2af0a50a4bb9be9f58681d417ceb9a7029caaf3b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 28 Feb 2018 11:23:41 -0500 +Subject: [PATCH] randr: Fix a crash on initialization with GPU screens +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RRSetChanged (immediately above) was immune to screens with no master, +but RRTellChanged was not: + + Thread 1 "X" received signal SIGSEGV, Segmentation fault. + RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576 + 576 mastersp = rrGetScrPriv(master); + (gdb) bt + #0 RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576 + #1 0x000055555566f1e9 in RRNoticePropertyChange (value=0x555555bfbf28, property=70, output=0x555555bfef10) at ../../randr/rrproperty.c:153 + #2 RRChangeOutputProperty (output=output@entry=0x555555bfef10, property=<optimized out>, type=type@entry=19, format=format@entry=32, mode=<optimized out>, mode@entry=0, len=len@entry=1, value=0x7fffffffe77c, sendevent=1, pending=0) + at ../../randr/rrproperty.c:263 + #3 0x000055555566dba5 in RROutputSetNonDesktop (output=output@entry=0x555555bfef10, nonDesktop=nonDesktop@entry=0) at ../../randr/rroutput.c:333 + ... + +Reported-by: Michel Dänzer <michel@daenzer.net> +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + randr/randr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/randr/randr.c b/randr/randr.c +index 339ad3ece..feb54bcc8 100644 +--- a/randr/randr.c ++++ b/randr/randr.c +@@ -602,6 +602,8 @@ RRTellChanged(ScreenPtr pScreen) + + if (pScreen->isGPU) { + master = pScreen->current_master; ++ if (!master) ++ return; + mastersp = rrGetScrPriv(master); + } + else { +-- +2.16.1 + |