2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index cbe571131..5bfe9312a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Kamil Dudka (12 Nov 2009)
+- Kevin Baughman provided a fix preventing libcurl-NSS from crash on doubly
+  closed NSPR descriptor. The issue was hard to find, reported several times
+  before and always closed unresolved. More info at the RH bug:
+  https://bugzilla.redhat.com/534176
+
 Yang Tse (11 Nov 2009)
 - Marco Maggi reported that compilation failed when configured --with-gssapi
   and GNU GSS installed due to a missing mutual exclusion of header files in
diff --git a/lib/nss.c b/lib/nss.c
index 10d07def8..5c1340fa9 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1227,7 +1227,9 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
   connssl->handle = SSL_ImportFD(model, connssl->handle);
   if(!connssl->handle)
     goto error;
+
   PR_Close(model); /* We don't need this any more */
+  model = NULL;
 
   /* This is the password associated with the cert that we're using */
   if (data->set.str[STRING_KEY_PASSWD]) {