forked from lix-project/lix
Be more strict about file names in NARs
This commit is contained in:
parent
276a40b31f
commit
985f1595fe
|
@ -231,7 +231,7 @@ static void parse(ParseSink & sink, Source & source, const Path & path)
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (s == "entry" && type == tpDirectory) {
|
else if (s == "entry" && type == tpDirectory) {
|
||||||
string name;
|
string name, prevName;
|
||||||
|
|
||||||
s = readString(source);
|
s = readString(source);
|
||||||
if (s != "(") throw badArchive("expected open tag");
|
if (s != "(") throw badArchive("expected open tag");
|
||||||
|
@ -245,6 +245,11 @@ static void parse(ParseSink & sink, Source & source, const Path & path)
|
||||||
break;
|
break;
|
||||||
} else if (s == "name") {
|
} else if (s == "name") {
|
||||||
name = readString(source);
|
name = readString(source);
|
||||||
|
if (name.empty() || name == "." || name == ".." || name.find('/') != string::npos || name.find((char) 0) != string::npos)
|
||||||
|
throw Error(format("NAR contains invalid file name `%1%'") % name);
|
||||||
|
if (name <= prevName)
|
||||||
|
throw Error("NAR directory is not sorted");
|
||||||
|
prevName = name;
|
||||||
if (useCaseHack) {
|
if (useCaseHack) {
|
||||||
auto i = names.find(name);
|
auto i = names.find(name);
|
||||||
if (i != names.end()) {
|
if (i != names.end()) {
|
||||||
|
|
Loading…
Reference in a new issue