From 1fc835aa223520f37e4945fa8626a096f170b188 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Thu, 2 Jul 2020 11:57:21 -0400
Subject: [PATCH] Tighten parsing for drv files and pathinfo

---
 src/libstore/content-address.cc | 4 ++--
 src/libstore/derivations.cc     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
index 2d96fb0c0..02ab6710f 100644
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@@ -68,7 +68,7 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
             throw Error("text content address hash should use %s, but instead uses %s",
                 printHashType(htSHA256), printHashType(hashType));
         return TextHash {
-            .hash = Hash::parseAny(rest, std::move(hashType)),
+            .hash = Hash::parseNonSRIUnprefixed(rest, std::move(hashType)),
         };
     } else if (prefix == "fixed") {
         // Parse method
@@ -80,7 +80,7 @@ ContentAddress parseContentAddress(std::string_view rawCa) {
         HashType hashType = parseHashType_();
         return FixedOutputHash {
             .method = method,
-            .hash = Hash::parseAny(rest, std::move(hashType)),
+            .hash = Hash::parseNonSRIUnprefixed(rest, std::move(hashType)),
         };
     } else
         throw UsageError("content address prefix \"%s\" is unrecognized. Recogonized prefixes are \"text\" or \"fixed\"", prefix);
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 30ce32354..149994e3e 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -118,7 +118,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
         const HashType hashType = parseHashType(hashAlgo);
         fsh = FixedOutputHash {
             .method = std::move(method),
-            .hash = Hash::parseAny(hash, hashType),
+            .hash = Hash::parseNonSRIUnprefixed(hash, hashType),
         };
     }
 
@@ -416,7 +416,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
         auto hashType = parseHashType(hashAlgo);
         fsh = FixedOutputHash {
             .method = std::move(method),
-            .hash = Hash::parseAny(hash, hashType),
+            .hash = Hash::parseNonSRIUnprefixed(hash, hashType),
         };
     }