aboutsummaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-10-22 08:36:32 -0400
committerNick Mathewson <nickm@torproject.org>2019-10-22 08:36:32 -0400
commit2d013bbe5cccaccf9ace0beec5a987fb80e850ad (patch)
tree39110f4cdfd13bc2479ea3a9d18105104a2a7f5d /src/feature
parenta1d53413742840f4dab499531cb29a9d74c51b8a (diff)
parent8162859ef727619493cfd9368214d3a769b338cb (diff)
downloadtor-2d013bbe5cccaccf9ace0beec5a987fb80e850ad.tar.gz
tor-2d013bbe5cccaccf9ace0beec5a987fb80e850ad.zip
Merge remote-tracking branch 'tor-github/pr/1417'
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/control/control_events.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c
index 82ea943999..00659c0477 100644
--- a/src/feature/control/control_events.c
+++ b/src/feature/control/control_events.c
@@ -1653,7 +1653,10 @@ control_event_status(int type, int severity, const char *format, va_list args)
log_warn(LD_BUG, "Format string too long.");
return -1;
}
- tor_vasprintf(&user_buf, format, args);
+ if (tor_vasprintf(&user_buf, format, args)<0) {
+ log_warn(LD_BUG, "Failed to create user buffer.");
+ return -1;
+ }
send_control_event(type, "%s %s\r\n", format_buf, user_buf);
tor_free(user_buf);