diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2015-06-23 16:23:25 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2015-06-24 03:38:16 +0200 |
| commit | 81a1270a56bf1f6a13e709e653598c69c7d9334b (patch) | |
| tree | 7411ac19a1c40e3f68bf25697daaf2bb1a5ddc44 /src/interface-curses.cpp | |
| parent | 9e3913e8e9c25916911ef5e9f2a2d5b17e9e8c5c (diff) | |
| download | sciteco-81a1270a56bf1f6a13e709e653598c69c7d9334b.tar.gz | |
fixed SEGFAULTs in InterfaceCurses::vmsg()
* both vmsg() and stdio_msg() behave like vprintf() are allowed
to leave their `va_list` in an undefined state.
* therefore when writing messages to stdio in addition to the
message line, we have to copy the argument list.
* fixes SEGFAULTs when trying to log any message
(but this bug did not manifest on every test system)
Diffstat (limited to 'src/interface-curses.cpp')
| -rw-r--r-- | src/interface-curses.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/interface-curses.cpp b/src/interface-curses.cpp index e46af51..c3216ce 100644 --- a/src/interface-curses.cpp +++ b/src/interface-curses.cpp @@ -384,20 +384,21 @@ InterfaceCurses::vmsg_impl(MessageType type, const gchar *fmt, va_list ap) { attr_t attr; + if (!msg_window) { /* batch mode */ + stdio_vmsg(type, fmt, ap); + return; + } + /* * On most platforms we can write to stdout/stderr * even in interactive mode. */ #if defined(XCURSES) || defined(PDCURSES_WIN32A) || \ defined(NCURSES_UNIX) || defined(NCURSES_WIN32) - stdio_vmsg(type, fmt, ap); - if (!msg_window) /* batch mode */ - return; -#else - if (!msg_window) { /* batch mode */ - stdio_vmsg(type, fmt, ap); - return; - } + va_list aq; + va_copy(aq, ap); + stdio_vmsg(type, fmt, aq); + va_end(aq); #endif switch (type) { |