From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 16 Jun 2011 18:13:55 +0000 (+0200)
Subject: Moved null check before initialization.
X-Git-Tag: gnutls_2_99_3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a1c9f6a600eeb2e53b43ee13069f7a48e60139;p=thirdparty%2Fgnutls.git

Moved null check before initialization.
---

diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 2a09808d72..d6beab34e6 100644
--- 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 99f626f1d6..5e461a97ea 100644
--- 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))