Skip to content

Fix crash when minipbrt::Loader::load(filename) could not open the file provided and crash with loop subdiv #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix crash when minipbrt::Loader::load(filename) could not open the file provided and crash with loop subdiv #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c5c69e
fix crash when file can not be found
Uedaki Dec 16, 2023
6781031
fix main compilation error
Uedaki Dec 16, 2023
cb24971
improve error handling
Uedaki Dec 29, 2023
201e1d5
Fix loop subdiv num points
Uedaki Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ namespace minipbrt {
const ImageFilm* imagefilm = dynamic_cast<const ImageFilm*>(film);
printf("xresolution = %d\n", imagefilm->xresolution);
printf("yresolution = %d\n", imagefilm->yresolution);
printf("cropwindow = [ %f, %f, %f, %f ]\n", imagefilm->cropwwindow[0], imagefilm->cropwwindow[1], imagefilm->cropwwindow[2], imagefilm->cropwwindow[3]);
printf("cropwindow = [ %f, %f, %f, %f ]\n", imagefilm->cropwindow[0], imagefilm->cropwindow[1], imagefilm->cropwindow[2], imagefilm->cropwindow[3]);
printf("scale = %f\n", imagefilm->scale);
printf("maxsampleluminance = %f\n", imagefilm->maxsampleluminance);
printf("diagonal = %f mm\n", imagefilm->diagonal);
Expand Down
19 changes: 12 additions & 7 deletions minipbrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5168,19 +5168,23 @@ namespace minipbrt {
m_error = nullptr;
}

FileData* fdata = &m_fileData[m_includeDepth];
int64_t errorOffset = fdata->bufOffset + static_cast<int64_t>(m_pos - m_buf);

char* errorMessage = new char[size_t(len + 1)];
va_start(args, fmt);
vsnprintf(errorMessage, size_t(len + 1), fmt, args);
va_end(args);

m_error = new Error(fdata->filename, errorOffset, errorMessage);
if (m_fileData)
{
FileData* fdata = &m_fileData[m_includeDepth];
int64_t errorOffset = fdata->bufOffset + static_cast<int64_t>(m_pos - m_buf);
m_error = new Error(fdata->filename, errorOffset, errorMessage);

int64_t errorLine, errorCol;
cursor_location(&errorLine, &errorCol);
m_error->set_line_and_column(errorLine, errorCol);
int64_t errorLine, errorCol;
cursor_location(&errorLine, &errorCol);
m_error->set_line_and_column(errorLine, errorCol);
}
else
m_error = new Error("", 0, errorMessage);
}


Expand Down Expand Up @@ -5901,6 +5905,7 @@ namespace minipbrt {
delete loopsubdiv;
return false;
}
loopsubdiv->num_points /= 3;
shape = loopsubdiv;
}
break;
Expand Down