From a41d45eedc0c217c28def47acbd8759e31706b96 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Oct 2019 11:59:39 -0400 Subject: [PATCH] dix: Fix undefined memset in dixInitPrivates When we set these up initially, no subsystems have allocated any privates yet, so the storage address will be null, and memset(NULL, ...) is undefined. --- dix/privates.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dix/privates.c b/dix/privates.c index 83dfabc47..3f768ef3e 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -447,7 +447,8 @@ _dixInitPrivates(PrivatePtr *privates, void *addr, DevPrivateType type) if (global_keys[type].offset == 0) addr = 0; *privates = addr; - memset(addr, '\0', global_keys[type].offset); + if (addr) + memset(addr, '\0', global_keys[type].offset); } /*