mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix unit test for format_helper_exit_status

Browse source 
Fix format_helper_exit_status to allow full HEX_ERRNO_SIZE answers,
*and* increase the buffer length again.
This commit is contained in:
Nick Mathewson 2013-10-10 11:15:35 -04:00
parent 6eb7f2f889
commit 004a9c6dd1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/util.c
View file

@ -3294,7 +3294,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 * Count how many chars of space we have left, and keep a pointer into the
* current point in the buffer. * current point in the buffer.
*/ */
left = HEX_ERRNO_SIZE; left = HEX_ERRNO_SIZE+1;
cur = hex_errno; cur = hex_errno;
/* Emit child_state */ /* Emit child_state */
@ -3594,7 +3594,7 @@ tor_spawn_background(const char *const filename, const char **argv,
this is used for printing out the error message */ this is used for printing out the error message */
unsigned char child_state = CHILD_STATE_INIT; 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; static int max_fd = -1;

1
src/test/test_util.c
View file

@ -2169,6 +2169,7 @@ test_util_exit_status(void *ptr)
n = format_helper_exit_status(0xFF, -0x80000000, hex_errno); n = format_helper_exit_status(0xFF, -0x80000000, hex_errno);
test_streq("FF/-80000000\n", hex_errno); test_streq("FF/-80000000\n", hex_errno);
test_eq(n, strlen(hex_errno)); test_eq(n, strlen(hex_errno));
test_eq(n, HEX_ERRNO_SIZE);
clear_hex_errno(hex_errno); clear_hex_errno(hex_errno);
n = format_helper_exit_status(0x7F, 0, hex_errno); n = format_helper_exit_status(0x7F, 0, hex_errno);