aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-03 15:16:36 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-03 15:16:36 -0500
commita96b46570fef6f883a385ad2220f8c48061defff (patch)
tree4cc31a1e0e13613c2440363a7991d791ef82e684 /src
parent0489f7e004af3b7de39b6ca530d4752688d4053f (diff)
parentcee433d751a2521fc6368ac01c1c67773a27c85a (diff)
downloadtor-a96b46570fef6f883a385ad2220f8c48061defff.tar.gz
tor-a96b46570fef6f883a385ad2220f8c48061defff.zip
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
-rw-r--r--src/common/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c
index f0a4cab01f..c38f1d10cc 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -175,6 +175,8 @@ _tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
{
void *result;
+ tor_assert(size < SIZE_T_CEILING);
+
#ifdef USE_DMALLOC
result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
#else