aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-10 10:53:27 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-10 10:53:27 -0400
commit6eb7f2f889d9e047ea75bad15531d4aff4dbc711 (patch)
treea33ee2ef32038c58e9cf0a2e99e3f3f339f3f4d6 /src
parentdece40fd7729934bc32906e94d3e5e746c01f970 (diff)
parentbfe56e05b08b940d432be9af824b969522eedc98 (diff)
downloadtor-6eb7f2f889d9e047ea75bad15531d4aff4dbc711.tar
tor-6eb7f2f889d9e047ea75bad15531d4aff4dbc711.tar.gz
Merge remote-tracking branch 'public/bug9928' into maint-0.2.3
Diffstat (limited to 'src')
-rw-r--r--src/common/util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 6fb597a3a..5b0dbcd07 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3256,10 +3256,10 @@ format_hex_number_for_helper_exit_status(unsigned int x, char *buf,
* <b>hex_errno</b>. Called between fork and _exit, so must be signal-handler
* safe.
*
- * <b>hex_errno</b> must have at least HEX_ERRNO_SIZE bytes available.
+ * <b>hex_errno</b> must have at least HEX_ERRNO_SIZE+1 bytes available.
*
* The format of <b>hex_errno</b> is: "CHILD_STATE/ERRNO\n", left-padded
- * with spaces. Note that there is no trailing \0. CHILD_STATE indicates where
+ * with spaces. CHILD_STATE indicates where
* in the processs of starting the child process did the failure occur (see
* CHILD_STATE_* macros for definition), and SAVED_ERRNO is the value of
* errno when the failure occurred.
@@ -3338,8 +3338,8 @@ format_helper_exit_status(unsigned char child_state, int saved_errno,
left -= written;
cur += written;
- /* Check that we have enough space left for a newline */
- if (left <= 0)
+ /* Check that we have enough space left for a newline and a NUL */
+ if (left <= 1)
goto err;
/* Emit the newline and NUL */
@@ -3594,7 +3594,7 @@ tor_spawn_background(const char *const filename, const char **argv,
this is used for printing out the error message */
unsigned char child_state = CHILD_STATE_INIT;
- char hex_errno[HEX_ERRNO_SIZE];
+ char hex_errno[HEX_ERRNO_SIZE + 1];
static int max_fd = -1;