[tor-commits] [tor/master] Refrain from doing exhaustive iteration over all values of integers

teor at torproject.org teor at torproject.org
Tue Mar 26 09:31:42 UTC 2019


commit 052ec08a085d69ac2ffb3475e61631b0aef26562
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Tue Mar 12 12:01:26 2019 +0200

    Refrain from doing exhaustive iteration over all values of integers
---
 src/test/test_ptr_slow.c | 57 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/test/test_ptr_slow.c b/src/test/test_ptr_slow.c
index a5914c912..632a30417 100644
--- a/src/test/test_ptr_slow.c
+++ b/src/test/test_ptr_slow.c
@@ -10,46 +10,65 @@
 #include <stdint.h>
 #include <limits.h>
 
-/** Check that all values of int can be cast to void * and back. */
+/** Assert that <b>a</b> can be cast to void * and back. */
+static void
+assert_int_voidptr_roundtrip(int a)
+{
+  intptr_t ap = (intptr_t)a;
+  void *b = (void *)ap;
+  intptr_t c = (intptr_t)b;
+  void *d = (void *)c;
+
+  tt_assert(ap == c);
+  tt_assert(b == d);
+
+ done:
+  return;
+}
+
 static void
 test_int_voidstar_interop(void *arg)
 {
   int a;
   (void)arg;
 
-  for (a = INT_MIN; a < INT_MAX; a++) {
-   intptr_t ap = (intptr_t)a;
-   void *b = (void *)ap;
-   intptr_t c = (intptr_t)b;
-   void *d = (void *)c;
+  for (a = 0; a <= 1024; a++) {
+    assert_int_voidptr_roundtrip(a);
+  }
 
-   tt_assert(ap == c);
-   tt_assert(b == d);
+  for (a = INT_MAX-1024; a < INT_MAX; a++) {
+    assert_int_voidptr_roundtrip(a);
   }
+}
+
+static void
+assert_uint_voidptr_roundtrip(unsigned int a)
+{
+ intptr_t ap = (intptr_t)a;
+ void *b = (void *)ap;
+ intptr_t c = (intptr_t)b;
+ void *d = (void *)c;
+
+ tt_assert(ap == c);
+ tt_assert(b == d);
 
  done:
   return;
 }
 
-/** Check that all values of unsigned int can be cast to void * and back. */
 static void
 test_uint_voidstar_interop(void *arg)
 {
   unsigned int a;
   (void)arg;
 
-  for (a = 0; a < UINT_MAX; a++) {
-   intptr_t ap = (intptr_t)a;
-   void *b = (void *)ap;
-   intptr_t c = (intptr_t)b;
-   void *d = (void *)c;
-
-   tt_assert(ap == c);
-   tt_assert(b == d);
+  for (a = 0; a <= 1024; a++) {
+    assert_uint_voidptr_roundtrip(a);
   }
 
- done:
-  return;
+  for (a = UINT_MAX-1024; a < UINT_MAX; a++) {
+    assert_uint_voidptr_roundtrip(a);
+  }
 }
 
 struct testcase_t slow_ptr_tests[] = {





More information about the tor-commits mailing list