From 4a977544657ae51a33447b4c4211009dacb09bdd Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Wed, 2 Jun 2021 19:21:15 +0200 Subject: [PATCH] Fix gdb crash due to SIGPIPE when the compile command fails Due to the SIGPIPE the gdb process is killed here, which is not helpful. 2021-06-05 Bernd Edlinger * compile/compile.c (scoped_ignore_sigpipe): New helper class. (compile_to_object): Ignore SIGPIPE before calling the plugin. --- gdb/ChangeLog | 5 +++++ gdb/compile/compile.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 58e288f4a6..dcb97ae046 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-06-05 Bernd Edlinger + + * compile/compile.c (scoped_ignore_sigpipe): New helper class. + (compile_to_object): Ignore SIGPIPE before calling the plugin. + 2021-06-05 Tom Tromey * data-directory/Makefile.in (Makefile): Use correct directory diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 8481d14576..8247fc4539 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -633,6 +633,33 @@ print_callback (void *ignore, const char *message) fputs_filtered (message, gdb_stderr); } +/* RAII class used to ignore SIGPIPE in a scope. */ + +class scoped_ignore_sigpipe +{ +public: + scoped_ignore_sigpipe () + { +#ifdef SIGPIPE + m_osigpipe = signal (SIGPIPE, SIG_IGN); +#endif + } + + ~scoped_ignore_sigpipe () + { +#ifdef SIGPIPE + signal (SIGPIPE, m_osigpipe); +#endif + } + + DISABLE_COPY_AND_ASSIGN (scoped_ignore_sigpipe); + +private: +#ifdef SIGPIPE + sighandler_t m_osigpipe = NULL; +#endif +}; + /* Process the compilation request. On success it returns the object and source file names. On an error condition, error () is called. */ @@ -755,6 +782,10 @@ compile_to_object (struct command_line *cmd, const char *cmd_string, fprintf_unfiltered (gdb_stdlog, "source file produced: %s\n\n", fnames.source_file ()); + /* If we don't do this, then GDB simply exits + when the compiler dies. */ + scoped_ignore_sigpipe ignore_sigpipe; + /* Call the compiler and start the compilation process. */ compiler->set_source_file (fnames.source_file ()); ok = compiler->compile (fnames.object_file (), compile_debug); -- 2.34.1