diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-02-26 09:32:15 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-02-26 09:32:15 +0000 |
| commit | 91bfa780ddd229cff6c3d86a8f05e3898ef65e53 (patch) | |
| tree | 97d9e42d73089f9b7a8aadfc3435a45b97d61227 /rts/eventlog | |
| parent | b1b95df69d97f279018b08d9e7c672318055bac4 (diff) | |
| download | haskell-91bfa780ddd229cff6c3d86a8f05e3898ef65e53.tar.gz | |
Fix crash when using printf format specifiers in traceEvent (#3874)
Diffstat (limited to 'rts/eventlog')
| -rw-r--r-- | rts/eventlog/EventLog.c | 4 | ||||
| -rw-r--r-- | rts/eventlog/EventLog.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rts/eventlog/EventLog.c b/rts/eventlog/EventLog.c index ede1615139..7026a2abaf 100644 --- a/rts/eventlog/EventLog.c +++ b/rts/eventlog/EventLog.c @@ -448,9 +448,9 @@ void postCapMsg(Capability *cap, char *msg, va_list ap) postLogMsg(&capEventBuf[cap->no], EVENT_LOG_MSG, msg, ap); } -void postUserMsg(Capability *cap, char *msg) +void postUserMsg(Capability *cap, char *msg, va_list ap) { - postLogMsg(&capEventBuf[cap->no], EVENT_USER_MSG, msg, NULL); + postLogMsg(&capEventBuf[cap->no], EVENT_USER_MSG, msg, ap); } void closeBlockMarker (EventsBuf *ebuf) diff --git a/rts/eventlog/EventLog.h b/rts/eventlog/EventLog.h index e2b8043f7e..fd87820e08 100644 --- a/rts/eventlog/EventLog.h +++ b/rts/eventlog/EventLog.h @@ -39,7 +39,7 @@ void postEvent(Capability *cap, EventTypeNum tag); void postMsg(char *msg, va_list ap); -void postUserMsg(Capability *cap, char *msg); +void postUserMsg(Capability *cap, char *msg, va_list ap); void postCapMsg(Capability *cap, char *msg, va_list ap); |