aboutsummaryrefslogtreecommitdiff
path: root/nix/libutil/gcrypt-hash.cc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-12-18 21:48:57 +0100
committerLudovic Courtès <ludo@gnu.org>2013-12-19 00:02:49 +0100
commit0c5028faea7e5c08c920f8ea31f02e7923b8c2d8 (patch)
treeeb48ffdc6c937bed19a81091dcd5d4cfad1e86b8 /nix/libutil/gcrypt-hash.cc
parent37dd969c2eff527e21e2d277b3f4433111a0ca9e (diff)
downloadguix-0c5028faea7e5c08c920f8ea31f02e7923b8c2d8.tar
guix-0c5028faea7e5c08c920f8ea31f02e7923b8c2d8.tar.gz
daemon: Fix 'HashSink::currentHash()'.
Before that, calls to 'HashSink::currentHash()' would eventually lead to a segfault because the underlying gcrypt handle has been closed. (Note that this method is only used via 'importPaths' and 'exportPath', though.) * nix/libutil/gcrypt-hash.hh (struct guix_hash_context): Add a constructor and a copy constructor; move out of 'extern "C"'. * nix/libutil/gcrypt-hash.cc (guix_hash_final): Clear 'md_handle' upon exit. * nix/sync-with-upstream (top_srcdir): Change hash.{cc,hh} to read 'struct Ctx' instead of 'union Ctx'.
Diffstat (limited to 'nix/libutil/gcrypt-hash.cc')
-rw-r--r--nix/libutil/gcrypt-hash.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/nix/libutil/gcrypt-hash.cc b/nix/libutil/gcrypt-hash.cc
index 553f633b93..c4ae7bfcc2 100644
--- a/nix/libutil/gcrypt-hash.cc
+++ b/nix/libutil/gcrypt-hash.cc
@@ -45,6 +45,7 @@ guix_hash_final (void *resbuf, struct guix_hash_context *ctx,
memcpy (resbuf, gcry_md_read (ctx->md_handle, algo),
gcry_md_get_algo_dlen (algo));
gcry_md_close (ctx->md_handle);
+ ctx->md_handle = NULL;
}
}