From 3933cf56afbe76b68a4c14956fd5b1e98d52fdba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 29 Jun 2020 22:45:41 +0200
Subject: [PATCH] NAR parser: Fix missing name field check

Discovered by @Kloenk.

(cherry picked from commit 2b834d48aae35c5050895fac540ca55387925d0f)
---
 src/libutil/archive.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index 3aa120270..8f0472106 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -261,7 +261,7 @@ static void parse(ParseSink & sink, Source & source, const Path & path)
                             names[name] = 0;
                     }
                 } else if (s == "node") {
-                    if (s.empty()) throw badArchive("entry name missing");
+                    if (name.empty()) throw badArchive("entry name missing");
                     parse(sink, source, path + "/" + name);
                 } else
                     throw badArchive("unknown field " + s);