diff --git a/Xi/listdev.c b/Xi/listdev.c
index 96c5746ad1..2def171845 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -361,7 +361,7 @@ ProcXListInputDevices(ClientPtr client)
 
     /* allocate space for reply */
     total_length = numdevs * sizeof(xDeviceInfo) + size + namesize;
-    char *devbuf = x_rpcbuf_reserve(&rpcbuf, total_length);
+    char *devbuf = x_rpcbuf_reserve0(&rpcbuf, total_length);
     if (!devbuf) {
         free(skip);
         return BadAlloc;
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 7a5dbb6b65..969a3f9ce2 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -98,7 +98,7 @@ ProcXQueryDeviceState(ClientPtr client)
     }
 
     x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
-    char *buf = x_rpcbuf_reserve(&rpcbuf, total_length);
+    char *buf = x_rpcbuf_reserve0(&rpcbuf, total_length);
     if (!buf)
         return BadAlloc;
 
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index b58240a522..9edf919bbd 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -99,7 +99,7 @@ ProcXIQueryDevice(ClientPtr client)
 
     x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
 
-    info = x_rpcbuf_reserve(&rpcbuf, len);
+    info = x_rpcbuf_reserve0(&rpcbuf, len);
     if (!info) {
         free(skip);
         return BadAlloc;
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index dbe4ed62b8..6cfb871f6f 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -139,7 +139,7 @@ ProcXIQueryPointer(ClientPtr client)
 
         const int buttons_size = bits_to_bytes(256); /* button map up to 255 */
         reply.buttons_len = bytes_to_int32(buttons_size);
-        char *buttons = x_rpcbuf_reserve(&rpcbuf, buttons_size);
+        char *buttons = x_rpcbuf_reserve0(&rpcbuf, buttons_size);
         if (!buttons)
             return BadAlloc;