generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Kevin Baughman found a double close() problem with libcurl-NSS, as when

Browse Source 
libcurl called NSS to close the SSL "session" it also closed the actual
  socket.
This commit is contained in:
Daniel Stenberg 2009-10-18 00:10:13 +00:00
parent b8b8c3d538
commit 167a92810a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -6,6 +6,11 @@
Changelog Changelog
Daniel Stenberg (18 Oct 2009)
- Kevin Baughman found a double close() problem with libcurl-NSS, as when
libcurl called NSS to close the SSL "session" it also closed the actual
socket.
Yang Tse (17 Oct 2009) Yang Tse (17 Oct 2009)
- Bug report #2866724 indicated - Bug report #2866724 indicated
(http://curl.haxx.se/bug/view.cgi?id=2866724) that curl on Windows failed (http://curl.haxx.se/bug/view.cgi?id=2866724) that curl on Windows failed

2
RELEASE-NOTES
View File

@ -36,6 +36,7 @@ This release includes the following bugfixes:
o don't shrink SO_SNDBUF on windows for those who have it set large already o don't shrink SO_SNDBUF on windows for those who have it set large already
o connect next bug o connect next bug
o invalid file name characters handling on Windows o invalid file name characters handling on Windows
o double close() on the primary socket with libcurl-NSS
This release includes the following known bugs: This release includes the following known bugs:
@ -48,5 +49,6 @@ advice from friends like these:
Michal Marek, Eric Wong, Guenter Knauf, Peter Sylvester, Daniel Johnson, Michal Marek, Eric Wong, Guenter Knauf, Peter Sylvester, Daniel Johnson,
Claes Jakobsson, Sven Anders, Chris Mumford, John P. McCaskey, Claes Jakobsson, Sven Anders, Chris Mumford, John P. McCaskey,
Constantine Sapuntzakis, Michael Stillwell, Tom Mueller, Dan Fandrich, Constantine Sapuntzakis, Michael Stillwell, Tom Mueller, Dan Fandrich,
Kevin Baughman
Thanks! (and sorry if I forgot to mention someone) Thanks! (and sorry if I forgot to mention someone)

8
lib/nss.c
View File

@ -927,11 +927,15 @@ void Curl_nss_close(struct connectdata *conn, int sockindex)
if(connssl->handle) { if(connssl->handle) {
PR_Close(connssl->handle); PR_Close(connssl->handle);
/* NSS closes the socket we previously handed to it, so we must mark it
as closed to avoid double close */
conn->sock[sockindex] = CURL_SOCKET_BAD;
if(connssl->client_nickname != NULL) { if(connssl->client_nickname != NULL) {
free(connssl->client_nickname); free(connssl->client_nickname);
connssl->client_nickname = NULL; connssl->client_nickname = NULL;
} }
#ifdef HAVE_PK11_CREATEGENERICOBJECT #ifdef HAVE_PK11_CREATEGENERICOBJECT
if(connssl->key) if(connssl->key)
(void)PK11_DestroyGenericObject(connssl->key); (void)PK11_DestroyGenericObject(connssl->key);
if(connssl->cacert[1]) if(connssl->cacert[1])
@ -973,7 +977,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
connssl->data = data; connssl->data = data;
#ifdef HAVE_PK11_CREATEGENERICOBJECT #ifdef HAVE_PK11_CREATEGENERICOBJECT
connssl->cacert[0] = NULL; connssl->cacert[0] = NULL;
connssl->cacert[1] = NULL; connssl->cacert[1] = NULL;
connssl->key = NULL; connssl->key = NULL;