torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid assertion on read_file_to_str() with size==SIZE_T_CEILING-1

Browse Source 
Spotted by doors, fixes bug 2326.
This commit is contained in:
Nick Mathewson
2011-01-03 15:30:11 -05:00
parent e09ab69703
commit e365aee971
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug2326
+6
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.
src/common/util.c
+1 -1
View File
@@ -1936,7 +1936,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out)
return NULL;
}
if ((uint64_t)(statbuf.st_size)+1 > SIZE_T_CEILING)
if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING)
return NULL;
string = tor_malloc((size_t)(statbuf.st_size+1));