From 592525386ad81cf9c8816f42f01a5bea01034e98 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 15 Oct 2019 13:32:36 -0400
Subject: [PATCH] dix: Fix undefined memset in _dixInitScreenPrivates

Again, memset(0, ...) is undefined.
---
 dix/privates.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/privates.c b/dix/privates.c
index 3f768ef3e..384936fbd 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -684,7 +684,8 @@ _dixInitScreenPrivates(ScreenPtr pScreen, PrivatePtr *privates, void *addr, DevP
     if (privates_size == 0)
         addr = 0;
     *privates = addr;
-    memset(addr, '\0', privates_size);
+    if (addr)
+        memset(addr, '\0', privates_size);
 }
 
 void *