Merge pull request #4008 from aszlig/fix-ub-in-reading-ca-map

Fix unspecified behaviour in readStorePathCAMap
2020-09-14 13:18:52 +02:00
parent 7cb5f643a6 525b38eee8
commit 8ebd10664e
1 changed files with 5 additions and 2 deletions
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -43,8 +43,11 @@ StorePathCAMap readStorePathCAMap(const Store & store, Source & from)
 {
    StorePathCAMap paths;
    auto count = readNum<size_t>(from);
-    while (count--)
-        paths.insert_or_assign(store.parseStorePath(readString(from)), parseContentAddressOpt(readString(from)));
+    while (count--) {
+        auto path = store.parseStorePath(readString(from));
+        auto ca = parseContentAddressOpt(readString(from));
+        paths.insert_or_assign(path, ca);
+    }
    return paths;
 }