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

llama_load_model_from_url: PR feedback, use snprintf instead of strncp and strncat

Browse source
This commit is contained in:
Pierrick HYMBERT 2024-03-16 20:02:34 +01:00
parent 5df5605b02
commit 78812c6d63
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/common.cpp
View file

@ -1667,16 +1667,14 @@ struct llama_model * llama_load_model_from_url(const char * model_url, const cha
struct stat buffer; struct stat buffer;
auto file_exists = (stat(path_model, &buffer) == 0); auto file_exists = (stat(path_model, &buffer) == 0);
// If the file exists, check for ${model_path}.etag or ${model_path}.lastModified files // If the file exists, check for ${path_model}.etag or ${path_model}.lastModified files
char etag[LLAMA_CURL_MAX_HEADER_LENGTH] = {0}; char etag[LLAMA_CURL_MAX_HEADER_LENGTH] = {0};
char etag_path[LLAMA_CURL_MAX_PATH_LENGTH] = {0}; char etag_path[LLAMA_CURL_MAX_PATH_LENGTH] = {0};
strncpy(etag_path, path_model, LLAMA_CURL_MAX_PATH_LENGTH - 6); // 6 is the length of ".etag\0" snprintf(etag_path, sizeof(etag_path), "%s.etag", path_model);
strncat(etag_path, ".etag", 6);
char last_modified[LLAMA_CURL_MAX_HEADER_LENGTH] = {0}; char last_modified[LLAMA_CURL_MAX_HEADER_LENGTH] = {0};
char last_modified_path[LLAMA_CURL_MAX_PATH_LENGTH] = {0}; char last_modified_path[LLAMA_CURL_MAX_PATH_LENGTH] = {0};
strncpy(last_modified_path, path_model, LLAMA_CURL_MAX_PATH_LENGTH - 15); // 15 is the length of ".lastModified\0" snprintf(last_modified_path, sizeof(last_modified_path), "%s.lastModified", path_model);
strncat(last_modified_path, ".lastModified", 15);
if (file_exists) { if (file_exists) {
auto * f_etag = fopen(etag_path, "r"); auto * f_etag = fopen(etag_path, "r");