nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #14283 from NixOS/nar-check

Browse source 
nix {cat,ls}: Add back missing checks for file descriptors
This commit is contained in:
John Ericson 2025-10-17 02:58:23 +00:00 • committed by GitHub
commit e34063cf21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix/cat.cc
View file

@ -76,6 +76,8 @@ struct CmdCatNar : StoreCommand, MixCat
void run(ref<Store> store) override void run(ref<Store> store) override
{ {
AutoCloseFD fd = open(narPath.c_str(), O_RDONLY); AutoCloseFD fd = open(narPath.c_str(), O_RDONLY);
if (!fd)
throw SysError("opening NAR file '%s'", narPath);
auto source = FdSource{fd.get()}; auto source = FdSource{fd.get()};
auto narAccessor = makeNarAccessor(source); auto narAccessor = makeNarAccessor(source);
auto listing = listNar(narAccessor, CanonPath::root, true); auto listing = listNar(narAccessor, CanonPath::root, true);

2
src/nix/ls.cc
View file

@ -146,6 +146,8 @@ struct CmdLsNar : Command, MixLs
void run() override void run() override
{ {
AutoCloseFD fd = open(narPath.c_str(), O_RDONLY); AutoCloseFD fd = open(narPath.c_str(), O_RDONLY);
if (!fd)
throw SysError("opening NAR file '%s'", narPath);
auto source = FdSource{fd.get()}; auto source = FdSource{fd.get()};
auto narAccessor = makeNarAccessor(source); auto narAccessor = makeNarAccessor(source);
auto listing = listNar(narAccessor, CanonPath::root, true); auto listing = listNar(narAccessor, CanonPath::root, true);