summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-02-20 18:50:40 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2017-02-20 18:52:20 +0100
commitee7bcb4d288eb76c8d6beae186e7e91055fbc84c (patch)
tree1ed9c4f9770a8081ef0f15e49130a13bbd63fa22
parent9e931dde713ceade35a983f5a2f88d61c29dcd76 (diff)
downloadgnutls-ee7bcb4d288eb76c8d6beae186e7e91055fbc84c.tar.gz
pkcs11: avoid calling memcpy will null options
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--lib/pkcs11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 2473a4c753..4bd2f3f232 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -3046,7 +3046,7 @@ gnutls_pkcs11_obj_list_import_url3(gnutls_pkcs11_obj_t * p_list,
const char *url,
unsigned int flags)
{
- gnutls_pkcs11_obj_t *list1;
+ gnutls_pkcs11_obj_t *list1 = NULL;
unsigned int n_list1, i;
int ret;
@@ -3064,7 +3064,7 @@ gnutls_pkcs11_obj_list_import_url3(gnutls_pkcs11_obj_t * p_list,
}
*n_list = n_list1;
- if (p_list)
+ if (p_list && list1)
memcpy(p_list, list1, n_list1*sizeof(p_list[0]));
gnutls_free(list1);