diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 15:31:19 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 15:31:19 -0500 |
commit | f089804332c0289159ec432d8ce82bb1ed6316aa (patch) | |
tree | 99e554c39190c48f67ab59fd176f3b3d27b25798 /src/common/util.c | |
parent | cee433d751a2521fc6368ac01c1c67773a27c85a (diff) | |
parent | e365aee97110c6c6df6f56ca9814d88c3808a2d1 (diff) | |
download | tor-f089804332c0289159ec432d8ce82bb1ed6316aa.tar.gz tor-f089804332c0289159ec432d8ce82bb1ed6316aa.zip |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/common/util.c')
-rw-r--r-- | src/common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index c7282e7332..abd87ea652 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -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) return NULL; string = tor_malloc((size_t)(statbuf.st_size+1)); |