diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 2d7bd5152e0386aa4341d7d000a36b92d2220d5f..2cf82260a9e594c386bd4a965ba0ab0a2c7cfa4d 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -694,7 +694,7 @@ virBufferEscapeN(virBufferPtr buf,
     char *out;
     const char *cur;
     virBufferEscapePair escapeItem;
-    virBufferEscapePairPtr escapeList = NULL;
+    VIR_AUTOPTR(virBufferEscapePair) escapeList = NULL;
     size_t nescapeList = 0;
     va_list ap;
 
@@ -752,7 +752,6 @@ virBufferEscapeN(virBufferPtr buf,
 
  cleanup:
     va_end(ap);
-    VIR_FREE(escapeList);
 }