From bc7839e29d6a4906bd0b8909fd12bb01933b143c Mon Sep 17 00:00:00 2001 From: David Levine Date: Sat, 3 Mar 2012 12:21:00 -0600 Subject: [PATCH] mhbuild -check would always fail because it tried to build the digest for the decoded contents file (cefile), which can be null. If it is, use the contents file itself. --- uip/mhbuildsbr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index e791713..fd6a974 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -1602,13 +1602,14 @@ calculate_digest (CT ct, int asciiP) unsigned char *dp; unsigned char digest[16]; unsigned char outbuf[25]; - FILE *in; MD5_CTX mdContext; CE ce = ct->c_cefile; + char *infilename = ce->ce_file ? ce->ce_file : ct->c_file; + FILE *in; /* open content */ - if ((in = fopen (ce->ce_file, "r")) == NULL) - adios (ce->ce_file, "unable to open for reading"); + if ((in = fopen (infilename, "r")) == NULL) + adios (infilename, "unable to open for reading"); /* Initialize md5 context */ MD5Init (&mdContext); -- 1.7.10.4