Skip to content

Fix crash with NUL character in path given to --file-list #8902

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

Merged
danmar merged 2 commits into from
Oct 2, 2026
Merged

Fix crash with NUL character in path given to --file-list #8902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87659d0
Fix crash with NUL character in path given to --file-list
Sep 28, 2026
0630687
Name the offending path in the NUL character error and add a test
Oct 1, 2026
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
8 changes: 8 additions & 0 deletions cli/filelister.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
if (path.empty())
return "no path specified";

const std::string::size_type nulPos = path.find('\0');
if (nulPos != std::string::npos)
return "path '" + path.substr(0, nulPos) + "' contains a NUL character";

std::list<FileWithDetails> filesSorted;

std::string err = addFiles2(filesSorted, path, extra, recursive, ignored, debug);
Expand Down Expand Up @@ -285,6 +289,10 @@ std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::s
if (path.empty())
return "no path specified";

const std::string::size_type nulPos = path.find('\0');
if (nulPos != std::string::npos)
return "path '" + path.substr(0, nulPos) + "' contains a NUL character";

std::string corrected_path = path;
if (endsWith(corrected_path, '/'))
corrected_path.erase(corrected_path.end() - 1);
Expand Down
8 changes: 8 additions & 0 deletions test/testfilelister.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class TestFileLister : public TestFixture {
void run() override {
TEST_CASE(recursiveAddFiles);
TEST_CASE(recursiveAddFilesEmptyPath);
TEST_CASE(recursiveAddFilesNulInPath);
TEST_CASE(excludeFile1);
TEST_CASE(excludeFile2);
TEST_CASE(excludeDir);
Expand Down Expand Up @@ -110,6 +111,13 @@ class TestFileLister : public TestFixture {
ASSERT_EQUALS("no path specified", err);
}

void recursiveAddFilesNulInPath() const {
std::list<FileWithDetails> files;
const std::string err = FileLister::recursiveAddFiles(files, std::string("lib\0", 4), {}, PathMatch());
Comment thread
danmar marked this conversation as resolved.
ASSERT_EQUALS("path 'lib' contains a NUL character", err);
ASSERT(files.empty());
}

void excludeFile1() const {
const std::string basedir = findBaseDir();

Expand Down
Loading