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

SIGPIPE: don't use 'data' in sigpipe restore

Browse Source 
Follow-up fix from 7d80ed64e43515.

The SessionHandle may not be around to use when we restore the sigpipe
sighandler so we store the no_signal boolean in the local struct to know
if/how to restore.
This commit is contained in:
Daniel Stenberg 2013-06-24 09:02:19 +02:00
parent d23745f7c9
commit 6117d4025e
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/easy.c
View File

@ -87,7 +87,12 @@
#include "memdebug.h" #include "memdebug.h"
#ifdef SIGPIPE_IGNORE #ifdef SIGPIPE_IGNORE
#define SIGPIPE_VARIABLE(x) struct sigaction x struct sigpipe_ignore {
struct sigaction pipe;
bool no_signal;
};
#define SIGPIPE_VARIABLE(x) struct sigpipe_ignore x
/* /*
* sigpipe_ignore() makes sure we ignore SIGPIPE while running libcurl * sigpipe_ignore() makes sure we ignore SIGPIPE while running libcurl
@ -95,13 +100,16 @@
* return from libcurl again. * return from libcurl again.
*/ */
static void sigpipe_ignore(struct SessionHandle *data, static void sigpipe_ignore(struct SessionHandle *data,
struct sigaction *pipe) struct sigpipe_ignore *ig)
{ {
/* get a local copy of no_signal because the SessionHandle might not be
around when we restore */
ig->no_signal = data->set.no_signal;
if(!data->set.no_signal) { if(!data->set.no_signal) {
struct sigaction action; struct sigaction action;
/* first, extract the existing situation */ /* first, extract the existing situation */
sigaction(SIGPIPE, NULL, pipe); sigaction(SIGPIPE, NULL, &ig->pipe);
action = *pipe; action = ig->pipe;
/* ignore this signal */ /* ignore this signal */
action.sa_handler = SIG_IGN; action.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &action, NULL); sigaction(SIGPIPE, &action, NULL);
@ -113,19 +121,17 @@ static void sigpipe_ignore(struct SessionHandle *data,
* and SIGPIPE handling. It MUST only be called after a corresponding * and SIGPIPE handling. It MUST only be called after a corresponding
* sigpipe_ignore() was used. * sigpipe_ignore() was used.
*/ */
static void sigpipe_restore(struct SessionHandle *data, static void sigpipe_restore(struct sigpipe_ignore *ig)
struct sigaction *pipe)
{ {
if(!data->set.no_signal) { if(!ig->no_signal)
/* restore the outside state */ /* restore the outside state */
sigaction(SIGPIPE, pipe, NULL); sigaction(SIGPIPE, &ig->pipe, NULL);
}
} }
#else #else
/* for systems without sigaction */ /* for systems without sigaction */
#define sigpipe_ignore(x,y) #define sigpipe_ignore(x,y)
#define sigpipe_restore(x,y) #define sigpipe_restore(x)
#define SIGPIPE_VARIABLE(x) #define SIGPIPE_VARIABLE(x)
#endif #endif
@ -562,7 +568,7 @@ CURLcode curl_easy_perform(CURL *easy)
a failure here, room for future improvement! */ a failure here, room for future improvement! */
(void)curl_multi_remove_handle(multi, easy); (void)curl_multi_remove_handle(multi, easy);
sigpipe_restore(data, &pipe); sigpipe_restore(&pipe);
/* The multi handle is kept alive, owned by the easy handle */ /* The multi handle is kept alive, owned by the easy handle */
return code; return code;
@ -582,7 +588,7 @@ void curl_easy_cleanup(CURL *curl)
sigpipe_ignore(data, &pipe); sigpipe_ignore(data, &pipe);
Curl_close(data); Curl_close(data);
sigpipe_restore(data, &pipe); sigpipe_restore(&pipe);
} }
/* /*