[tor-commits] [tor/master] Fix a minor coverity-found bug in tests

[nickm at torproject.org]

commit 3bf808c3410a18508a70737329b0930f1693e262
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Jun 8 19:58:27 2011 +0200

    Fix a minor coverity-found bug in tests
---
 changes/coverity_master |    4 ++++
 src/test/test_util.c    |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/changes/coverity_master b/changes/coverity_master
new file mode 100644
index 0000000..3b61087
--- /dev/null
+++ b/changes/coverity_master
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Prevent using negative indices during unit test runs when read_all()
+      fails. Spotted by coverity. Bugfix on 0.2.3.1.
+
diff --git a/src/test/test_util.c b/src/test/test_util.c
index d338bba..afc4d5c 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1397,6 +1397,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out,
 
   /* Check stdout */
   pos = read_all(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, 0);
+  tor_assert(pos >= 0);
   stdout_buf[pos] = '\0';
   tt_int_op(pos, ==, strlen(expected_out));
   tt_str_op(stdout_buf, ==, expected_out);
@@ -1411,6 +1412,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out,
 
   /* Check stderr */
   pos = read_all(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1, 0);
+  tor_assert(pos >= 0);
   stderr_buf[pos] = '\0';
   tt_int_op(pos, ==, strlen(expected_err));
   tt_str_op(stderr_buf, ==, expected_err);