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

fix: ensure proper cleanup of img_res_v.data in all code paths

Browse source
This commit is contained in:
yushihang 2025-02-06 10:38:28 +08:00
parent 902368a06b
commit 56979aebea
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/llava/llava.cpp
View file

@ -282,6 +282,7 @@ static bool encode_image_with_clip(clip_ctx * ctx_clip, int n_threads, const cli
if (!encoded) { if (!encoded) {
LOG_ERR("Unable to encode image - spatial_unpad - subimage %d of %d\n", (int) i+1, (int) img_res_v.size); LOG_ERR("Unable to encode image - spatial_unpad - subimage %d of %d\n", (int) i+1, (int) img_res_v.size);
delete[] img_res_v.data; // 添加内存释放
return false; return false;
} }
const int64_t t_img_enc_steop_batch_us = ggml_time_us(); const int64_t t_img_enc_steop_batch_us = ggml_time_us();
@ -322,6 +323,7 @@ static bool encode_image_with_clip(clip_ctx * ctx_clip, int n_threads, const cli
*n_img_pos = (pos * pos + 2); *n_img_pos = (pos * pos + 2);
if (!encoded){ if (!encoded){
LOG_ERR("Unable to encode image \n"); LOG_ERR("Unable to encode image \n");
delete[] img_res_v.data; // 添加内存释放
return false; return false;
} }
} }
@ -346,6 +348,7 @@ static bool encode_image_with_clip(clip_ctx * ctx_clip, int n_threads, const cli
const bool encoded = clip_image_encode(ctx_clip, n_threads, &img_res_v.data[i], image_embd_v[i]); // image data is in 3x336x336 format and will be converted to 336x336x3 inside const bool encoded = clip_image_encode(ctx_clip, n_threads, &img_res_v.data[i], image_embd_v[i]); // image data is in 3x336x336 format and will be converted to 336x336x3 inside
if (!encoded) { if (!encoded) {
LOG_ERR("Unable to encode image - spatial_unpad - subimage %d of %d\n", (int) i+1, (int) img_res_v.size); LOG_ERR("Unable to encode image - spatial_unpad - subimage %d of %d\n", (int) i+1, (int) img_res_v.size);
delete[] img_res_v.data; // 添加内存释放
return false; return false;
} }
} }