From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 5 Jul 2014 01:09:05 +0000 (+0100)
Subject: progs/hashsum.c (checkhash): Fix stupid bugs.
X-Git-Tag: 2.1.7~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb/commitdiff_plain/24e2740222dcebd76c8c5340298d4dbf7660c935

progs/hashsum.c (checkhash): Fix stupid bugs.

  * Initialize the return code.  Not sure why this didn't get a warning.

  * Pick up changes of hash function properly.
---

diff --git a/progs/hashsum.c b/progs/hashsum.c
index 8cc19265..df1fdaea 100644
--- a/progs/hashsum.c
+++ b/progs/hashsum.c
@@ -90,7 +90,7 @@ static int warnjunk(const char *path, const struct stat *st, void *p)
 
 static int checkhash(fhashstate *fh, const char *file, const encodeops *e)
 {
-  int rc;
+  int rc = 0;
   hfpctx hfp;
   dstr dl = DSTR_INIT;
   dstr df = DSTR_INIT;
@@ -116,6 +116,7 @@ static int checkhash(fhashstate *fh, const char *file, const encodeops *e)
       case HF_HASH:
 	xfree(hfp.hbuf);
 	hfp.hbuf = xmalloc(2 * hfp.gch->hashsz);
+	fh->gch = hfp.gch;
 	break;
       case HF_FILE:
 	if (fhash(fh, df.buf, hfp.hbuf + hfp.gch->hashsz)) {