Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'depfile-empty'

Browse Source 
2c300a4c0a Fix out-of-bounds read on empty gcc-style depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11293
This commit is contained in:
Brad King
2025-10-09 12:02:59 +00:00
committed by Kitware Robot
parent 48b5d61970 2c300a4c0a
commit 420be50b5e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmDependsCompiler.cxx
View File

@@ -96,9 +96,9 @@ bool cmDependsCompiler::CheckDependencies(
std::vector<std::string> depends;
if (format == "custom"_s) {
auto deps = cmReadGccDepfile(
cm::optional<cmGccDepfileContent> deps = cmReadGccDepfile(
depFile.c_str(), this->LocalGenerator->GetCurrentBinaryDirectory());
if (!deps) {
if (!deps || deps->empty()) {
continue;
}
@@ -130,10 +130,10 @@ bool cmDependsCompiler::CheckDependencies(
depends.emplace_back(std::move(line));
}
} else if (format == "gcc"_s) {
auto deps = cmReadGccDepfile(
cm::optional<cmGccDepfileContent> deps = cmReadGccDepfile(
depFile.c_str(), this->LocalGenerator->GetCurrentBinaryDirectory(),
GccDepfilePrependPaths::Deps);
if (!deps) {
if (!deps || deps->empty()) {
continue;
}