From ea8e8df6c783fd9c0185d31ffca4e518a43fe247 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2016 18:35:12 +0200
Subject: [PATCH] NarInfo::NarInfo(): Ensure that we get a NAR size/hash
---
src/libstore/nar-info.cc | 4 ++--
src/libutil/hash.cc | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc
index 1aacca84b..b0a8d77c2 100644
--- a/src/libstore/nar-info.cc
+++ b/src/libstore/nar-info.cc
@@ -6,7 +6,7 @@ namespace nix {
NarInfo::NarInfo(const Store & store, const std::string & s, const std::string & whence)
{
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) {
@@ -73,7 +73,7 @@ NarInfo::NarInfo(const Store & store, const std::string & s, const std::string &
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
diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc
index fa4258777..5352483ff 100644
--- a/src/libutil/hash.cc
+++ b/src/libutil/hash.cc
@@ -121,6 +121,7 @@ const string base32Chars = "0123456789abcdfghijklmnpqrsvwxyz";
string printHash32(const Hash & hash)
{
+ assert(hash.type != htUnknown);
size_t len = hash.base32Len();
assert(len);
--
GitLab