Skip to content

Commit 69d8e4b

Browse files
authored
Merge pull request ggml-org#122 from TheTom/fix/cve-2026-21869-n-discard-clamp
security: cherry-pick CVE-2026-21869 (n_discard heap-buffer-overflow in server)
2 parents 60fc495 + 170bd4b commit 69d8e4b

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

tools/server/server-task.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ task_params server_task::params_from_json_cmpl(
269269
params.n_indent = json_value(data, "n_indent", defaults.n_indent);
270270
params.n_keep = json_value(data, "n_keep", defaults.n_keep);
271271
params.n_discard = json_value(data, "n_discard", defaults.n_discard);
272+
params.n_discard = std::max(0, params.n_discard);
272273
params.n_cmpl = json_value(data, "n_cmpl", json_value(data, "n", 1));
273274
params.n_cache_reuse = json_value(data, "n_cache_reuse", defaults.n_cache_reuse);
274275
//params.t_max_prompt_ms = json_value(data, "t_max_prompt_ms", defaults.t_max_prompt_ms); // TODO: implement

0 commit comments

Comments
 (0)