diff --git a/clang/tools/c-index-test/c-index-test.c b/clang/tools/c-index-test/c-index-test.c
index 50f32c0a20e5a..1ad2e44aae3f7 100644
--- a/clang/tools/c-index-test/c-index-test.c
+++ b/clang/tools/c-index-test/c-index-test.c
@@ -3554,13 +3554,11 @@ static CXIdxClientContainer makeClientContainer(CXClientData *client_data,
 
   clang_indexLoc_getFileLocation(loc, &file, 0, &line, &column, 0);
 
-  len = sizeof(IndexDataStringList) + strlen(name) + digitCount(line) +
-        digitCount(column) + 3;
-  node = (IndexDataStringList *)malloc(len);
+  datalen = strlen(name) + digitCount(line) + digitCount(column) + 3;
+  node = (IndexDataStringList *)malloc(len + sizeof(IndexDataStringList));
   assert(node);
   newStr = node->data;
-  snprintf(newStr, len - sizeof(IndexDataStringList), "%s:%d:%d", name, line,
-           column);
+  snprintf(newStr, datalen, "%s:%d:%d", name, line, column);
 
   /* Remember string so it can be freed later. */
   index_data = (IndexData *)client_data;