Bug 807250: Backout cset 4a1849df5e3e due to assertion failuresNSS_3_15_5_BETA1

1 files changed, 6 insertions, 9 deletions

diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
index 64b8b9a8e..60916776d 100644
--- a/lib/ssl/sslsock.c
+++ b/lib/ssl/sslsock.c
@@ -152,7 +152,7 @@ ssl_GetPrivate(PRFileDesc *fd)
     }
 
     ss = (sslSocket *)fd->secret;
-    PORT_Assert(ss->fd == fd);
+    ss->fd = fd;
     return ss;
 }
 
@@ -177,7 +177,7 @@ ssl_FindSocket(PRFileDesc *fd)
     }
 
     ss = (sslSocket *)layer->secret;
-    PORT_Assert(ss->fd == layer);
+    ss->fd = layer;
     return ss;
 }
 
@@ -1316,13 +1316,10 @@ ssl_ImportFD(PRFileDesc *model, PRFileDesc *fd, SSLProtocolVariant variant)
 	SET_ERROR_CODE
 	return NULL;
     }
-#if defined(DEBUG) || defined(FORCE_PR_ASSERT)
-    {
-	sslSocket * ss = ssl_FindSocket(fd);
-	PORT_Assert(ss == ns);
-    }
-#endif
-    ns->TCPconnected = (PR_SUCCESS == ssl_DefGetpeername(ns, &addr));
+    ns = ssl_FindSocket(fd);
+    PORT_Assert(ns);
+    if (ns)
+	ns->TCPconnected = (PR_SUCCESS == ssl_DefGetpeername(ns, &addr));
     return fd;
 }