[tor-commits] [tor/release-0.2.4] Make ensure_capacity a bit more pedantically correct

[nickm@xxxxxxxxxxxxxx]

commit c2fd64846978290b0e7c7165d7658a5e704eee8f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 11 12:54:52 2016 -0500

    Make ensure_capacity a bit more pedantically correct
    
    Issues noted by cypherpunks on #18162
---
 src/common/container.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common/container.c b/src/common/container.c
index 46d9c2e..b1431df 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -58,11 +58,16 @@ smartlist_clear(smartlist_t *sl)
   sl->num_used = 0;
 }
 
+#if SIZE_MAX < INT_MAX
+#error "We don't support systems where size_t is smaller than int."
+#endif
+
 /** Make sure that <b>sl</b> can hold at least <b>size</b> entries. */
 static INLINE void
 smartlist_ensure_capacity(smartlist_t *sl, size_t size)
 {
-#if SIZEOF_SIZE_T > SIZEOF_INT
+  /* Set MAX_CAPACITY to MIN(INT_MAX, SIZE_MAX / sizeof(void*)) */
+#if (SIZE_MAX/SIZEOF_VOID_P) > INT_MAX
 #define MAX_CAPACITY (INT_MAX)
 #else
 #define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*))))



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits