wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

fromStructuredAttrs(): Don't crash if exportReferencesGraph is a string

Browse source 
Fixes

  error: [json.exception.type_error.302] type must be array, but is string

and other crashes.

Fixes #13254.

(cherry picked from commit d877b0c0cc)
This commit is contained in:
Eelco Dolstra 2025-05-24 00:14:32 +02:00 • committed by Mergify
parent acc3cd460d
commit 8ca4d2ef08
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/derivation-options.cc
View file

@ -211,8 +211,13 @@ DerivationOptions::fromStructuredAttrs(const StringMap & env, const StructuredAt
auto e = optionalValueAt(parsed->structuredAttrs, "exportReferencesGraph"); auto e = optionalValueAt(parsed->structuredAttrs, "exportReferencesGraph");
if (!e || !e->is_object()) if (!e || !e->is_object())
return ret; return ret;
for (auto & [key, storePathsJson] : getObject(*e)) { for (auto & [key, value] : getObject(*e)) {
ret.insert_or_assign(key, storePathsJson); if (value.is_array())
ret.insert_or_assign(key, value);
else if (value.is_string())
ret.insert_or_assign(key, StringSet{value});
else
throw Error("'exportReferencesGraph' value is not an array or a string");
} }
} else { } else {
auto s = getOr(env, "exportReferencesGraph", ""); auto s = getOr(env, "exportReferencesGraph", "");

2
src/libstore/misc.cc
View file

@ -225,6 +225,8 @@ void Store::queryMissing(const std::vector<DerivedPath> & targets,
auto parsedDrv = StructuredAttrs::tryParse(drv->env); auto parsedDrv = StructuredAttrs::tryParse(drv->env);
DerivationOptions drvOptions; DerivationOptions drvOptions;
try { try {
// FIXME: this is a lot of work just to get the value
// of `allowSubstitutes`.
drvOptions = DerivationOptions::fromStructuredAttrs( drvOptions = DerivationOptions::fromStructuredAttrs(
drv->env, drv->env,
parsedDrv ? &*parsedDrv : nullptr); parsedDrv ? &*parsedDrv : nullptr);