blender
/
blender
137
415
Fork 597
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

GPU: Fix out of bound write when logging system paths #120967

Merged
Jeroen Bakker merged 2 commits from Jeroen-Bakker/blender:gpu/increase-filename-buffer into main 2024-04-23 12:51:02 +02:00
Conversation 0 Commits 2 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_shader_log.cc
View File

@ -210,8 +210,8 @@ void Shader::print_log(Span<const char *> sources,
}
/* Print the filename the error line is coming from. */
if (!log_item.cursor.file_name_and_error_line.is_empty()) {
char name_buf[128];
log_item.cursor.file_name_and_error_line.copy(name_buf);
char name_buf[256];
log_item.cursor.file_name_and_error_line.substr(0, sizeof(name_buf) - 1).copy(name_buf);
Jeroen-Bakker marked this conversation as resolved Outdated
Clément Foucault commented 2024-04-23 11:32:18 +02:00
Outdated
Review
Copy Link

While I'm ok with making name_buf bigger, I think it is better make this line safe.
Use log_item.cursor.file_name_and_error_line.substr(0, sizeof(name_buf) - 1).copy(name_buf);.

While I'm ok with making `name_buf` bigger, I think it is better make this line safe. Use `log_item.cursor.file_name_and_error_line.substr(0, sizeof(name_buf) - 1).copy(name_buf);`.
BLI_dynstr_appendf(dynstr, "%s%s: %s", info_col, name_buf, reset_col);
}
else if (source_index > 0) {