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

Fix: OpenGL: Avoid substring out of bounds assert

Browse Source 
Check if line_start_get result is valid.
This commit is contained in:
Miguel Pozo
2025-10-03 15:51:39 +02:00
parent 1395abc502
commit 4b9ce68737
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/gpu/opengl/gl_shader_log.cc
View File

@@ -61,12 +61,15 @@ const char *GLLogParser::parse_line(const char *source_combined,
if (log_item.cursor.row != -1) {
/* Get to the wanted line. */
size_t line_start_character = line_start_get(source_combined, log_item.cursor.row);
StringRef filename = filename_get(source_combined, line_start_character);
size_t line_number = source_line_get(source_combined, line_start_character);
log_item.cursor.file_name_and_error_line = std::string(filename) + ':' +
std::to_string(line_number);
if (log_item.cursor.column != -1) {
log_item.cursor.file_name_and_error_line += ':' + std::to_string(log_item.cursor.column + 1);
if (line_start_character != -1) {
StringRef filename = filename_get(source_combined, line_start_character);
size_t line_number = source_line_get(source_combined, line_start_character);
log_item.cursor.file_name_and_error_line = std::string(filename) + ':' +
std::to_string(line_number);
if (log_item.cursor.column != -1) {
log_item.cursor.file_name_and_error_line += ':' +
std::to_string(log_item.cursor.column + 1);
}
}
}