diff --git a/Xi/getprop.c b/Xi/getprop.c
index 4e23c100e..79ef8ef60 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -118,6 +118,8 @@ ProcXGetDeviceDontPropagateList(ClientPtr client)
         if (count) {
             rep.count = count;
             buf = calloc(rep.count, sizeof(XEventClass));
+            if (!buf)
+                return BadAlloc;
             rep.length = bytes_to_int32(rep.count * sizeof(XEventClass));
 
             tbuf = buf;