tor

commit 2d013bbe5cccaccf9ace0beec5a987fb80e850ad
parent a1d53413742840f4dab499531cb29a9d74c51b8a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 22 Oct 2019 08:36:32 -0400

Merge remote-tracking branch 'tor-github/pr/1417'

Diffstat:
A
changes/31147
 | 
3
+++
M
src/feature/control/control_events.c
 | 
5
++++-
M
src/lib/buf/buffers.c
 | 
1
+
M
src/lib/process/process.c
 | 
1
+

4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/31147 b/changes/31147
@@ -0,0 +1,3 @@
+  o Minor features (defense in depth):
+    - Add additional sanity checks around tor_vasprintf() usage in case the
+      function returns an error. Patch by Tobias Stoeckmann. Fixes ticket 31147.
diff --git 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);
diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c
@@ -578,6 +578,7 @@ buf_add_vprintf(buf_t *buf, const char *format, va_list args)
   /* XXXX Faster implementations are easy enough, but let's optimize later */
   char *tmp;
   tor_vasprintf(&tmp, format, args);
+  tor_assert(tmp != NULL);
   buf_add(buf, tmp, strlen(tmp));
   tor_free(tmp);
 }
diff --git a/src/lib/process/process.c b/src/lib/process/process.c
@@ -550,6 +550,7 @@ process_vprintf(process_t *process,
   char *data;
 
   size = tor_vasprintf(&data, format, args);
+  tor_assert(data != NULL);
   process_write(process, (uint8_t *)data, size);
   tor_free(data);
 }