diff --git a/Xi/getprop.c b/Xi/getprop.c
index 7249266bc..63e9a3ba1 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -117,6 +117,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;