nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +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:31:19 -05:00
commit f089804332
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug2326 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes
- Fix a bug where we would assert if we ever had a
cached-descriptors.new file (or another file read directly into
memory) of exactly SIZE_T_CEILING bytes. Found by doors; fixes
bug 2326; bugfix on 0.2.1.25.

2
src/common/util.c
View File

@ -2140,7 +2140,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out)
return NULL; return NULL;
} }
if ((uint64_t)(statbuf.st_size)+1 > SIZE_T_CEILING) if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING)
return NULL; return NULL;
string = tor_malloc((size_t)(statbuf.st_size+1)); string = tor_malloc((size_t)(statbuf.st_size+1));