commit d0a9876b31a7f823030f686f262cc47cb2ef131a
author Jean-Paul Calderone <exarkun@divmod.com> Sat Jul 25 21:23:01 2009 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Sat Jul 25 21:23:01 2009 -0400
tree a27f37aa46b77b40fee3c63a9e9fb81597e48876
parent 7426ed8c1ac526177a65ac044b836212d517b982

avoid GC untrack if we haven't yet GC tracked

src/crypto/pkcs12.c

diff --git a/src/crypto/pkcs12.c b/src/crypto/pkcs12.c
index 2f6f944..2302242 100644
--- a/src/crypto/pkcs12.c
+++ b/src/crypto/pkcs12.c
@@ -20,6 +20,7 @@
  */
 
 static void crypto_PKCS12_dealloc(crypto_PKCS12Obj *self);
+static int crypto_PKCS12_clear(crypto_PKCS12Obj *self);
 
 static char crypto_PKCS12_get_certificate_doc[] = "\n\
 Return certificate portion of the PKCS12 structure\n\
@@ -414,7 +415,10 @@
 
 error:
     sk_X509_free(cacerts); /* NULL safe. Free just the container. */
-    crypto_PKCS12_dealloc(self);
+    if (self) {
+        crypto_PKCS12_clear(self);
+        PyObject_GC_Del(self);
+    }
     return NULL;
 }