From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 2 Feb 2016 11:46:50 +0000 (+0000)
Subject: Merge branch 'master' into 4.next
X-Git-Tag: exim-4_91_RC1~148^2~42^2~31
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/468c0c7e3066886ff5028bb423b96712a155fe05

Merge branch 'master' into 4.next
---

468c0c7e3066886ff5028bb423b96712a155fe05
diff --cc src/src/pdkim/pdkim.c
index a099f94b0,789d650e6..2d5f621b4
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@@ -1471,16 -1443,14 +1443,10 @@@ if (  pdkim_headcat(&col, hdr, ";", "a=
  
        if (!i)
  	if (!pdkim_headcat(&col, hdr, NULL, NULL, ":"))
--	  {
- 	  free(f);
  	  goto BAIL;
--	  }
  
        if (!pdkim_headcat(&col, hdr, s, i, n))
--	{
- 	free(f);
  	goto BAIL;
--	}
  
        if (!c)
          break;
@@@ -1507,7 -1476,7 +1472,7 @@@
      snprintf(minibuf, 20, "%lu", sig->created);
      if(!pdkim_headcat(&col, hdr, ";", "t=", minibuf))
        goto BAIL;
--  }
++    }
  
    if (sig->expires > 0)
      {
@@@ -1534,7 -1503,7 +1499,7 @@@
        goto BAIL;
      if (!pdkim_headcat(&col, hdr, ";", "b=", base64_b))
        goto BAIL;
--  }
++    }
    else 
      if(!pdkim_headcat(&col, hdr, ";", "b=", ""))
        goto BAIL;