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 *