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

use size_t rather than int for directory lengths in memory

Browse Source 
this might fix a bug with amd64


svn:r2410
This commit is contained in:
Roger Dingledine
2004-10-01 21:02:12 +00:00
parent 39b477a881
commit b9f03c8f03
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/dirserv.c
+7 -9
View File
@@ -643,14 +643,14 @@ dirserv_dump_directory_to_string(char *s, unsigned int maxlen,
/** Most recently generated encoded signed directory. */
static char *the_directory = NULL;
static int the_directory_len = -1;
static size_t the_directory_len = 0;
static char *the_directory_z = NULL;
static int the_directory_z_len = -1;
static size_t the_directory_z_len = 0;
static char *cached_directory = NULL; /* used only by non-auth dirservers */
static int cached_directory_len = -1;
static size_t cached_directory_len = 0;
static char *cached_directory_z = NULL;
static int cached_directory_z_len = -1;
static size_t cached_directory_z_len = 0;
static time_t cached_directory_published = 0;
void dirserv_set_cached_directory(const char *directory, time_t when)
@@ -692,7 +692,7 @@ size_t dirserv_get_directory(const char **directory, int compress)
if (!options.AuthoritativeDir) {
if (compress?cached_directory_z:cached_directory) {
*directory = compress?cached_directory_z:cached_directory;
return (size_t) (compress?cached_directory_z_len:cached_directory_len);
return compress?cached_directory_z_len:cached_directory_len;
} else {
/* no directory yet retrieved */
return 0;
@@ -717,7 +717,6 @@ static int dirserv_regenerate_directory(void)
char *new_directory;
char filename[512];
size_t z_dir_len;
new_directory = tor_malloc(MAX_DIR_SIZE);
if (dirserv_dump_directory_to_string(new_directory, MAX_DIR_SIZE,
get_identity_key())) {
@@ -728,16 +727,15 @@ static int dirserv_regenerate_directory(void)
tor_free(the_directory);
the_directory = new_directory;
the_directory_len = strlen(the_directory);
log_fn(LOG_INFO,"New directory (size %d):\n%s",the_directory_len,
log_fn(LOG_INFO,"New directory (size %d):\n%s",(int)the_directory_len,
the_directory);
tor_free(the_directory_z);
if (tor_gzip_compress(&the_directory_z, &z_dir_len,
if (tor_gzip_compress(&the_directory_z, &the_directory_z_len,
the_directory, the_directory_len,
ZLIB_METHOD)) {
log_fn(LOG_WARN, "Error gzipping directory.");
return -1;
}
the_directory_z_len = (int)z_dir_len;
/* Now read the directory we just made in order to update our own
* router lists. This does more signature checking than is strictly
trunk/src/or/main.c
+1 -1
View File
@@ -979,7 +979,7 @@ static void dumpstats(int severity) {
#else
"Average bandwidth used: %llu/%ld = %d bytes/sec",
#endif
stats_n_bytes_read, stats_n_seconds_uptime,
(long long unsigned int)stats_n_bytes_read, stats_n_seconds_uptime,
(int) (stats_n_bytes_read/stats_n_seconds_uptime));
rep_hist_dump_stats(now,severity);