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 | |
| parent | 27cefef3a21e69d801c30d1450399b7d034c0f20 (diff) | |
| parent | e09ab69703967716b2765e062ca229e641dba53e (diff) | |
| download | tor-cee433d751a2521fc6368ac01c1c67773a27c85a.tar.gz tor-cee433d751a2521fc6368ac01c1c67773a27c85a.zip | |
Merge remote branch 'origin/maint-0.2.1' into 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 4e859779b7..c7282e7332 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 |