summaryrefslogtreecommitdiff
path: root/user/xf86-video-nouveau/dont-strcmp-null.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-13 03:16:08 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-09-13 03:16:08 +0000
commit6222744c490dc72725976f1fe3024742c16e34ee (patch)
treefccf331c0a980d763809d9281eec33c5567f710a /user/xf86-video-nouveau/dont-strcmp-null.patch
parent5d5a8835844801be442de1332ef81052544949ef (diff)
downloadpackages-6222744c490dc72725976f1fe3024742c16e34ee.tar.gz
packages-6222744c490dc72725976f1fe3024742c16e34ee.tar.bz2
packages-6222744c490dc72725976f1fe3024742c16e34ee.tar.xz
packages-6222744c490dc72725976f1fe3024742c16e34ee.zip
user/xf86-video-nouveau: new package
Diffstat (limited to 'user/xf86-video-nouveau/dont-strcmp-null.patch')
-rw-r--r--user/xf86-video-nouveau/dont-strcmp-null.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/user/xf86-video-nouveau/dont-strcmp-null.patch b/user/xf86-video-nouveau/dont-strcmp-null.patch
new file mode 100644
index 000000000..23c4fd216
--- /dev/null
+++ b/user/xf86-video-nouveau/dont-strcmp-null.patch
@@ -0,0 +1,33 @@
+From 69aecdd305defdd014bc92b82acc6000988511cf Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 13 Jun 2017 09:23:42 -0400
+Subject: modesetting: Validate the atom for enum properties
+
+The client could have said anything here, and if what they said doesn't
+actually name an atom NameForAtom() will return NULL, and strcmp() will
+be unhappy about that.
+
+[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc]
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/drmmode_display.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 2b71c9c..04a0b57 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -1081,7 +1081,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
+ if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
+ return FALSE;
+ memcpy(&atom, value->data, 4);
+- name = NameForAtom(atom);
++ if (!(name = NameForAtom(atom)))
++ return FALSE;
+
+ /* search for matching name string, then set its value down */
+ for (j = 0; j < p->mode_prop->count_enums; j++) {
+--
+cgit v1.1
+