Fix l= label / Fix missing string terminator

2 files changed, 4 insertions, 3 deletions

diff --git a/src/src/dkim.c b/src/src/dkim.c
index ecabe6d6d..dd8334b63 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.c,v 1.1.2.10 2009/05/19 09:34:59 tom Exp $ */
+/* $Cambridge: exim/src/src/dkim.c,v 1.1.2.11 2009/05/19 09:49:14 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -116,7 +116,7 @@ int dkim_exim_verify_finish(void) {
         US""
       ),
       ((dkim_signatures->bodylength > -1)?
-        string_sprintf("x=%lu ", dkim_signatures->bodylength)
+        string_sprintf("l=%lu ", dkim_signatures->bodylength)
         :
         US""
       )
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 35c6ed9b5..51e01f7f5 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -20,7 +20,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* $Cambridge: exim/src/src/pdkim/pdkim.c,v 1.1.2.14 2009/04/30 19:15:48 tom Exp $ */
+/* $Cambridge: exim/src/src/pdkim/pdkim.c,v 1.1.2.15 2009/05/19 09:49:14 tom Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -442,6 +442,7 @@ char *pdkim_decode_qp(char *str) {
     }
     p++;
   }
+  *q = '\0';
   return n;
 }