diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 15:15:54 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 15:15:54 -0500 |
commit | cee433d751a2521fc6368ac01c1c67773a27c85a (patch) | |
tree | 3b61db93c0549ddea7884e8e823790315785a951 /src/common/util.c | |
parent | 27cefef3a21e69d801c30d1450399b7d034c0f20 (diff) | |
parent | e09ab69703967716b2765e062ca229e641dba53e (diff) | |
download | tor-cee433d751a2521fc6368ac01c1c67773a27c85a.tar tor-cee433d751a2521fc6368ac01c1c67773a27c85a.tar.gz |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/common/util.c')
-rw-r--r-- | src/common/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c index 4e859779b..c7282e733 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -174,6 +174,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 |