@@ -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.
+
@@ -2140,7 +2140,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)
string = tor_malloc((size_t)(statbuf.st_size+1));