nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.1'

Browse Source
This commit is contained in:
Nick Mathewson 2017-06-26 10:32:57 -04:00
commit 82a68be69a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/storagedir.c
View File

@ -210,7 +210,9 @@ storage_dir_read(storage_dir_t *d, const char *fname, int bin, size_t *sz_out)
char *contents = read_file_to_str(path, flags, &st); char *contents = read_file_to_str(path, flags, &st);
if (contents && sz_out) { if (contents && sz_out) {
// it fits in RAM, so we know its size is less than SIZE_MAX // it fits in RAM, so we know its size is less than SIZE_MAX
#if UINT64_MAX > SIZE_MAX
tor_assert((uint64_t)st.st_size <= SIZE_MAX); tor_assert((uint64_t)st.st_size <= SIZE_MAX);
#endif
*sz_out = (size_t) st.st_size; *sz_out = (size_t) st.st_size;
} }