Skip to content

Fix null pointer dereference in DependencyInfoDumpingHandler #1546

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
YLChen-007 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −0
Open

Fix null pointer dereference in DependencyInfoDumpingHandler #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions glslc/src/dependency_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ bool DependencyInfoDumpingHandler::DumpDependencyInfo(
std::ofstream potential_file_stream_for_dep_info_dump;
std::ostream* dep_file_stream = shaderc_util::GetOutputStream(
dep_file_name, &potential_file_stream_for_dep_info_dump, &std::cerr);
if (!dep_file_stream) {
// An error message has already been emitted to the stderr stream.
return false;
}
*dep_file_stream << dep_string_stream.str();
if (dep_file_stream->fail()) {
std::cerr << "glslc: error: error writing dependent_files info to output "
Expand Down
10 changes: 10 additions & 0 deletions glslc/test/option_dash_M.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,3 +752,13 @@ class TestErrorMissingDependencyTargetName(expect.StderrMatch):
glslc_args = ['target', 'shader.vert', '-c', '-MT']
expected_stderr = ['glslc: error: '
'missing dependency info target after \'-MT\'\n']


@inside_glslc_testsuite('OptionsCapM')
class TestErrorDashMFUnwritableFile(expect.ErrorMessageSubstr):
"""Tests that when we fail to make an output dependency file, glslc
fails gracefully and emits an error message instead of crashing."""
environment = EMPTY_SHADER_IN_CURDIR
bad_file = '/file/should/not/exist/today.d'
glslc_args = ['-MD', '-MF', bad_file, 'shader.vert']
expected_error_substr = ['cannot open output file']
Loading