aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-10 11:18:07 -0400
committerNick Mathewson <nickm@torproject.org>2013-10-10 11:18:07 -0400
commit7b1b8c36942a09ff4c50ac228f465aa4050153e3 (patch)
treeec4f224727635f4d46f5d4d641cdd2952e10e86f /src/common/util.c
parent1137817319c7a9e4293e9901405d01e7b85da6ea (diff)
parent004a9c6dd11ba71f310b750f00d5ed403faceb5a (diff)
downloadtor-7b1b8c36942a09ff4c50ac228f465aa4050153e3.tar
tor-7b1b8c36942a09ff4c50ac228f465aa4050153e3.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 36468d2d8..ae385e1b9 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3412,7 +3412,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno,
* Count how many chars of space we have left, and keep a pointer into the
* current point in the buffer.
*/
- left = HEX_ERRNO_SIZE;
+ left = HEX_ERRNO_SIZE+1;
cur = hex_errno;
/* Emit child_state */
@@ -3712,7 +3712,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 + 1];
+ char hex_errno[HEX_ERRNO_SIZE + 2]; /* + 1 should be sufficient actually */
static int max_fd = -1;