Moved null check before initialization.

diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 2a09808d72d336a743770d49b133af89fc188d49..d6beab34e6f34b8b1c40b9ca0014b20a7786cf4a 100644 (file)
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -1045,14 +1045,14 @@ gnutls_pubkey_import_dsa_raw (gnutls_pubkey_t key,
 {
   size_t siz = 0;
 
-  gnutls_pk_params_init(&key->params);
-
   if (key == NULL)
     {
       gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
     }
 
+  gnutls_pk_params_init(&key->params);
+
   siz = p->size;
   if (_gnutls_mpi_scan_nz (&key->params.params[0], p->data, siz))
     {

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 99f626f1d66b6c0277a848b57dd5c3b6b7290030..5e461a97eade87a5939192193699eb3ee42ba3ff 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -629,15 +629,13 @@ gnutls_x509_privkey_import_rsa_raw2 (gnutls_x509_privkey_t key,
   int ret;
   size_t siz = 0;
 
-  gnutls_pk_params_init(&key->params);
-
   if (key == NULL)
     {
       gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
     }
 
-  key->params.params_nr = 0;
+  gnutls_pk_params_init(&key->params);
 
   siz = m->size;
   if (_gnutls_mpi_scan_nz (&key->params.params[0], m->data, siz))