artemist/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Value::mkPath: Avoid potential crash from null string_view

Browse source
This commit is contained in:
Robert Hensing 2022-02-26 02:30:29 +01:00
parent 1b978596b5
commit bbf55383e7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/eval.cc
View file

@ -842,8 +842,15 @@ void Value::mkStringMove(const char * s, const PathSet & context)
void Value::mkPath(std::string_view s) void Value::mkPath(std::string_view s)
{ {
if (s.size() == 0) {
// Pathological, but better than crashing in dupStringWithLen, as
// s.data() may be null.
mkPath("");
}
else {
mkPath(dupStringWithLen(s.data(), s.size())); mkPath(dupStringWithLen(s.data(), s.size()));
} }
}
inline Value * EvalState::lookupVar(Env * env, const ExprVar & var, bool noEval) inline Value * EvalState::lookupVar(Env * env, const ExprVar & var, bool noEval)