From: Phil Pennock <pdp@exim.org>
Date: Sun, 27 May 2012 00:10:40 +0000 (-0400)
Subject: fix size param for gnutls_dh_params_export_pkcs3() again
X-Git-Tag: exim-4_80_RC6~8
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f00591e43de58718045ab86916011cc564e5201;p=exim.git

fix size param for gnutls_dh_params_export_pkcs3() again
---

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index b2659d7a7..aa2f92514 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -512,18 +512,15 @@ if (rc < 0)
   m.data = malloc(m.size);
   if (m.data == NULL)
     return tls_error(US"memory allocation failed", strerror(errno), NULL);
-  /* this will return a size 1 less than the allocation size above; I
-  originally used sz so as to avoid type compatibility errors, as gnutls_datum
-  uses "unsigned int" for the size field, but this call takes separate data
-  and size fields, with the latter being a size_t*.  For now, we live with
-  the error as being safer than throwing away type information. */
+  /* this will return a size 1 less than the allocation size above */
   rc = gnutls_dh_params_export_pkcs3(dh_server_params, GNUTLS_X509_FMT_PEM,
-      m.data, &m.size);
+      m.data, &sz);
   if (rc != GNUTLS_E_SUCCESS)
     {
     free(m.data);
     exim_gnutls_err_check(US"gnutls_dh_params_export_pkcs3() real");
     }
+  m.size = sz; /* shrink by 1, probably */
 
   sz = write_to_fd_buf(fd, m.data, (size_t) m.size);
   if (sz != m.size)