vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for a null pointer dereference if a metal GGML buffer fails to be allocated

Browse source
This commit is contained in:
Paul Tsochantaris 2024-01-29 20:59:43 +00:00
parent 2aed77eb06
commit e9dcc37498
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ggml-alloc.c
View file

@ -788,10 +788,12 @@ static bool alloc_tensor_range(struct ggml_context * ctx,
#ifndef NDEBUG
fprintf(stderr, "%s: failed to allocate %s buffer of size %zu\n", __func__, ggml_backend_buft_name(buft), size);
#endif
for (size_t i = 0; i < *n_buffers; i++) {
ggml_backend_buffer_free(*buffers[i]);
if (buffers && *buffers) {
for (size_t i = 0; i < *n_buffers; i++) {
ggml_backend_buffer_free(*buffers[i]);
}
free(buffers);
}
free(buffers);
return false;
}
@ -843,10 +845,12 @@ ggml_backend_buffer_t ggml_backend_alloc_ctx_tensors_from_buft(struct ggml_conte
__func__, t->name,
ggml_backend_buft_name(buft),
this_size, max_size);
for (size_t i = 0; i < n_buffers; i++) {
ggml_backend_buffer_free(buffers[i]);
if(buffers && *buffers) {
for (size_t i = 0; i < n_buffers; i++) {
ggml_backend_buffer_free(buffers[i]);
}
free(buffers);
}
free(buffers);
return NULL;
}