mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-env: Fix segfault if -f argument is not a directory or a Nix expression

Browse source 
Fixes #2425.
This commit is contained in:
Eelco Dolstra 2018-09-17 16:36:30 +02:00
parent 901dfc7978
commit 52f6d541b9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix-env/nix-env.cc
View file

@ -150,10 +150,8 @@ static void loadSourceExpr(EvalState & state, const Path & path, Value & v)
if (stat(path.c_str(), &st) == -1) if (stat(path.c_str(), &st) == -1)
throw SysError(format("getting information about '%1%'") % path); throw SysError(format("getting information about '%1%'") % path);
if (isNixExpr(path, st)) { if (isNixExpr(path, st))
state.evalFile(path, v); state.evalFile(path, v);
return;
}
/* The path is a directory. Put the Nix expressions in the /* The path is a directory. Put the Nix expressions in the
directory in a set, with the file name of each expression as directory in a set, with the file name of each expression as
@ -161,13 +159,15 @@ static void loadSourceExpr(EvalState & state, const Path & path, Value & v)
set flat, not nested, to make it easier for a user to have a set flat, not nested, to make it easier for a user to have a
~/.nix-defexpr directory that includes some system-wide ~/.nix-defexpr directory that includes some system-wide
directory). */ directory). */
if (S_ISDIR(st.st_mode)) { else if (S_ISDIR(st.st_mode)) {
state.mkAttrs(v, 1024); state.mkAttrs(v, 1024);
state.mkList(*state.allocAttr(v, state.symbols.create("_combineChannels")), 0); state.mkList(*state.allocAttr(v, state.symbols.create("_combineChannels")), 0);
StringSet attrs; StringSet attrs;
getAllExprs(state, path, attrs, v); getAllExprs(state, path, attrs, v);
v.attrs->sort(); v.attrs->sort();
} }
else throw Error("path '%s' is not a directory or a Nix expression", path);
} }