[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
211/376: Fix off-by-one
From: |
Ludovic Court�s |
Subject: |
211/376: Fix off-by-one |
Date: |
Wed, 28 Jan 2015 22:05:07 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit ea525a261f3206006318e6c93e7f41d8ac823e69
Author: Eelco Dolstra <address@hidden>
Date: Fri Sep 19 18:08:14 2014 +0200
Fix off-by-one
---
src/libexpr/primops.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 2dd242a..a5bac3f 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -89,7 +89,7 @@ static void prim_scopedImport(EvalState & state, const Pos &
pos, Value * * args
if (isStorePath(path) && store->isValidPath(path) && isDerivation(path)) {
Derivation drv = readDerivation(path);
Value & w = *state.allocValue();
- state.mkAttrs(w, 1 + drv.outputs.size());
+ state.mkAttrs(w, 2 + drv.outputs.size());
mkString(*state.allocAttr(w, state.sDrvPath), path,
singleton<PathSet>("=" + path));
state.mkList(*state.allocAttr(w, state.symbols.create("outputs")),
drv.outputs.size());
unsigned int outputs_index = 0;
- 204/376: Install some pkgconfig files, (continued)
- 204/376: Install some pkgconfig files, Ludovic Court�s, 2015/01/28
- 206/376: Store.so: Add dependency on libnixutil, Ludovic Court�s, 2015/01/28
- 200/376: Add some instrumentation for debugging GC leaks, Ludovic Court�s, 2015/01/28
- 210/376: Inline Bindings::find(), Ludovic Court�s, 2015/01/28
- 202/376: On Linux, disable address space randomization, Ludovic Court�s, 2015/01/28
- 205/376: Update spec file, Ludovic Court�s, 2015/01/28
- 201/376: Add Make flag to disable optimization, Ludovic Court�s, 2015/01/28
- 213/376: configure: Force regeneration of Makefile.config, Ludovic Court�s, 2015/01/28
- 212/376: attrNames: Don't allocate duplicates of the symbols, Ludovic Court�s, 2015/01/28
- 216/376: Handle cycles when printing a value, Ludovic Court�s, 2015/01/28
- 211/376: Fix off-by-one,
Ludovic Court�s <=
- 215/376: Add ‘seq’ primop, Ludovic Court�s, 2015/01/28
- 209/376: Store Attrs inside Bindings, Ludovic Court�s, 2015/01/28
- 208/376: Remove bogus comment, Ludovic Court�s, 2015/01/28
- 219/376: Add ‘deepSeq’ primop, Ludovic Court�s, 2015/01/28
- 225/376: Pass through --set from nix-install-package command line to nix-env, Ludovic Court�s, 2015/01/28
- 214/376: Add a function ‘valueSize’, Ludovic Court�s, 2015/01/28
- 145/376: Use proper quotes everywhere, Ludovic Court�s, 2015/01/28
- 226/376: Add --force-name support for --set in nix-env, to support nix-install-package --set, Ludovic Court�s, 2015/01/28
- 220/376: Don't evaluate inside a "throw", Ludovic Court�s, 2015/01/28
- 217/376: Rename strictForceValue -> forceValueDeep, Ludovic Court�s, 2015/01/28