[glib-networking/pgriffis/pkcs11-pin-termination: 3/3] gnutls: Ensure that PKCS #11 pins are NUL terminated

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8407244f73d76dabbb8e3e2d7ca74035ca8f2d51
Author: Patrick Griffis <pgriffis igalia com>
Date:   Fri Jul 9 19:19:04 2021 -0500

    gnutls: Ensure that PKCS #11 pins are NUL terminated

 tls/gnutls/gtlsconnection-gnutls.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 3b574a52..54902666 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -335,10 +335,13 @@ on_pin_request (void         *userdata,
       {
         gsize password_size;
         const guchar *password_data = g_tls_password_get_value (password, &password_size);
-        if (password_size > pin_max)
+        if (password_size > pin_max - 1)
           g_info ("PIN is larger than max PIN size");
 
-        memcpy (pin, password_data, MIN (password_size, pin_max));
+        /* Ensure NUL-termination */
+        memset (pin, 0, pin_max);
+        memcpy (pin, password_data, MIN (password_size, pin_max - 1));
+
         ret = GNUTLS_E_SUCCESS;
     }