aboutsummaryrefslogtreecommitdiff
path: root/src/common/torint.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-12-16 17:24:11 -0500
committerRoger Dingledine <arma@torproject.org>2010-12-16 17:24:11 -0500
commitc63c937465f91b60f07e70942e2cb5af1b90dce4 (patch)
tree1b44da39cbe47b5176829100ed8ff038348681fc /src/common/torint.h
parent591f65dde68c7847e4282c4cba5a11868fe13158 (diff)
parentb5e293afe6b3c98b50c23cc443969b5f840dca32 (diff)
downloadtor-c63c937465f91b60f07e70942e2cb5af1b90dce4.tar
tor-c63c937465f91b60f07e70942e2cb5af1b90dce4.tar.gz
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
Diffstat (limited to 'src/common/torint.h')
-rw-r--r--src/common/torint.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/torint.h b/src/common/torint.h
index 57f18212a..a57d50100 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -330,7 +330,7 @@ typedef uint32_t uintptr_t;
#endif
/* Any size_t larger than this amount is likely to be an underflow. */
-#define SIZE_T_CEILING (sizeof(char)<<(sizeof(size_t)*8 - 1))
+#define SIZE_T_CEILING (SSIZE_T_MAX-16)
#endif /* __TORINT_H */