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

NarInfo::NarInfo(): Ensure that we get a NAR size/hash

Browse source
This commit is contained in:
Eelco Dolstra 2016-07-21 18:35:12 +02:00
parent e682a8e138
commit ea8e8df6c7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/nar-info.cc
View file

@ -6,7 +6,7 @@ namespace nix {
NarInfo::NarInfo(const Store & store, const std::string & s, const std::string & whence) NarInfo::NarInfo(const Store & store, const std::string & s, const std::string & whence)
{ {
auto corrupt = [&]() { auto corrupt = [&]() {
throw Error("NAR info file ‘%1%’ is corrupt"); throw Error(format("NAR info file ‘%1%’ is corrupt") % whence);
}; };
auto parseHashField = [&](const string & s) { auto parseHashField = [&](const string & s) {
@ -73,7 +73,7 @@ NarInfo::NarInfo(const Store & store, const std::string & s, const std::string &
if (compression == "") compression = "bzip2"; if (compression == "") compression = "bzip2";
if (path.empty() || url.empty()) corrupt(); if (path.empty() || url.empty() || narSize == 0 || !narHash) corrupt();
} }
std::string NarInfo::to_string() const std::string NarInfo::to_string() const

1
src/libutil/hash.cc
View file

@ -121,6 +121,7 @@ const string base32Chars = "0123456789abcdfghijklmnpqrsvwxyz";
string printHash32(const Hash & hash) string printHash32(const Hash & hash)
{ {
assert(hash.type != htUnknown);
size_t len = hash.base32Len(); size_t len = hash.base32Len();
assert(len); assert(len);