diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 15:16:36 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 15:16:36 -0500 |
| commit | a96b46570fef6f883a385ad2220f8c48061defff (patch) | |
| tree | 4cc31a1e0e13613c2440363a7991d791ef82e684 | |
| parent | 0489f7e004af3b7de39b6ca530d4752688d4053f (diff) | |
| parent | cee433d751a2521fc6368ac01c1c67773a27c85a (diff) | |
| download | tor-a96b46570fef6f883a385ad2220f8c48061defff.tar.gz tor-a96b46570fef6f883a385ad2220f8c48061defff.zip | |
Merge remote branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug2324 | 4 | ||||
| -rw-r--r-- | src/common/util.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug2324 b/changes/bug2324 new file mode 100644 index 0000000000..eefc8370ef --- /dev/null +++ b/changes/bug2324 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Add a check for SIZE_T_MAX to tor_realloc to try to avoid + underflow errors there too. Fixes bug 2324. + 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 |