commit 585cd9ec6a8dd34c5023a5f63c66b5b7d1bccc22
author Rick Dean <rick@fdd.com> Sat Jul 18 14:58:11 2009 -0500
committer Rick Dean <rick@fdd.com> Sat Jul 18 14:58:11 2009 -0500
tree 4069685be5c7e56f7a0224e3df9ab4fb05c8a88f
parent 94e46fd81fa8c6d3beb39beee7599a4f59074e31

The PyObjets of struct crypto_PKCS12Obj are never NULL so stop checking.

src/crypto/pkcs12.c

diff --git a/src/crypto/pkcs12.c b/src/crypto/pkcs12.c
index e5854d9..5ef699d 100644
--- a/src/crypto/pkcs12.c
+++ b/src/crypto/pkcs12.c
@@ -59,9 +59,7 @@
     }
 
     Py_INCREF(cert);  /* Make consistent before calling Py_DECREF() */
-    if(self->cert) {
-        Py_DECREF(self->cert);
-    }
+    Py_DECREF(self->cert);
     self->cert = cert;
 
     Py_INCREF(Py_None);
@@ -106,9 +104,7 @@
     }
 
     Py_INCREF(pkey);  /* Make consistent before calling Py_DECREF() */
-    if(self->key) {
-        Py_DECREF(self->key);
-    }
+    Py_DECREF(self->key);
     self->key = pkey;
 
     Py_INCREF(Py_None);
@@ -167,9 +163,7 @@
     }
 
     Py_INCREF(cacerts); /* Make consistent before calling Py_DECREF() */
-    if(self->cacerts) {
-        Py_DECREF(self->cacerts);
-    }
+    Py_DECREF(self->cacerts);
     self->cacerts = cacerts;
 
     Py_INCREF(Py_None);
@@ -209,14 +203,14 @@
         kwlist, &passphrase, &friendly_name, &iter, &maciter))
         return NULL;
 
-    if (self->key && self->key != Py_None) {
+    if (self->key != Py_None) {
         pkey = ((crypto_PKeyObj*) self->key)->pkey;
     }
-    if (self->cert && self->cert != Py_None) {
+    if (self->cert != Py_None) {
         x509 = ((crypto_X509Obj*) self->cert)->x509;
     }
     cacerts = sk_X509_new_null();
-    if (self->cacerts && self->cacerts != Py_None) {
+    if (self->cacerts != Py_None) {
         int i; /* Py_ssize_t for Python 2.5+ */
         PyObject *obj;
         for(i = 0;i < PySequence_Length(self->cacerts);i++) {  /* For each CA cert */
@@ -299,8 +293,6 @@
     if (!(self = PyObject_GC_New(crypto_PKCS12Obj, &crypto_PKCS12_Type)))
         return NULL;
 
-    self->cert = NULL;
-    self->key = NULL;
     Py_INCREF(Py_None);
     self->cacerts = Py_None;
 

src/crypto/pkcs12.h

diff --git a/src/crypto/pkcs12.h b/src/crypto/pkcs12.h
index 0e724a9..373fc22 100644
--- a/src/crypto/pkcs12.h
+++ b/src/crypto/pkcs12.h
@@ -22,8 +22,8 @@
 
 typedef struct {
     PyObject_HEAD
-    PyObject            *cert;
-    PyObject            *key;
+    PyObject            *cert;  /* never NULL */
+    PyObject            *key;   /* never NULL */
     PyObject            *cacerts;
 } crypto_PKCS12Obj;