nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-01-03 15:15:54 -05:00
commit cee433d751
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug2324 Normal file
View File

@ -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.

2
src/common/util.c
View File

@ -174,6 +174,8 @@ _tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
{ {
void *result; void *result;
tor_assert(size < SIZE_T_CEILING);
#ifdef USE_DMALLOC #ifdef USE_DMALLOC
result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0); result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
#else #else