griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove use of potentially unsafe strncat & strcpy

Browse Source
This commit is contained in:
Campbell Barton
2024-06-12 10:52:09 +10:00
parent a5f331afc0
commit 91d45db8bb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/opengl/gl_shader.cc
View File

@@ -1662,8 +1662,9 @@ void GLCompilerWorker::compile(const GLSourcesBaked &sources)
auto add_src = [&](const std::string &src) {
if (!src.empty()) {
strcpy(next_src, src.c_str());
next_src += src.size() + sizeof('\0');
const size_t src_size = src.size() + 1;
memcpy(next_src, src.c_str(), src_size);
next_src += src_size;
}
};

7
source/blender/sequencer/intern/disk_cache.cc
View File

@@ -284,12 +284,9 @@ static void seq_disk_cache_get_project_dir(SeqDiskCache *disk_cache,
size_t dirpath_maxncpy)
{
char cache_dir[FILE_MAX];
BLI_path_split_file_part(
BKE_main_blendfile_path(disk_cache->bmain), cache_dir, sizeof(cache_dir));
const char *blendfile_path = BKE_main_blendfile_path(disk_cache->bmain);
/* Use suffix, so that the cache directory name does not conflict with the bmain's blend file. */
const char *suffix = "_seq_cache";
strncat(cache_dir, suffix, sizeof(cache_dir) - strlen(cache_dir) - 1);
SNPRINTF(cache_dir, "%s_seq_cache", BLI_path_basename(blendfile_path));
BLI_path_join(dirpath, dirpath_maxncpy, seq_disk_cache_base_dir(), cache_dir);
}