From 9a390c4829cd3058d26a2e2c09d16e3fd12bf1b1 Mon Sep 17 00:00:00 2001
From: Anthony Umfer <aumfer@gmail.com>
Date: Sun, 11 May 2025 11:08:26 -0400
Subject: [PATCH] tools : fix uninitialized llama_batch in server (#13436)

* add constructor to initialize server_context::batch, preventing destructor's call to llama_batch_free from causing an invalid free()

* Update tools/server/server.cpp

Co-authored-by: Xuan-Son Nguyen <thichthat@gmail.com>

* use C++11 initializer syntax

* switch from Copy-list-initialization to Direct-list-initialization

---------

Co-authored-by: Xuan-Son Nguyen <thichthat@gmail.com>
---
 tools/server/server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/server/server.cpp b/tools/server/server.cpp
index de8ded71f..7169ffdce 100644
--- a/tools/server/server.cpp
+++ b/tools/server/server.cpp
@@ -1862,7 +1862,7 @@ struct server_context {
 
     llama_context_params cparams_dft;
 
-    llama_batch batch;
+    llama_batch batch {};
 
     bool clean_kv_cache = true;
     bool add_bos_token  = true;