From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 28 Mar 2017 19:41:59 +0000 (+0200)
Subject: Fix i386 compilation from spooling patch. I seem to be good at breaking that.
X-Git-Tag: tor-0.3.1.1-alpha~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be778a65dfd85c34481af32fcfb0338522bacd1e;p=thirdparty%2Ftor.git

Fix i386 compilation from spooling patch. I seem to be good at breaking that.
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index b78af307ce..0e899a759c 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3661,7 +3661,7 @@ void
 dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
                                             time_t cutoff,
                                             int compression,
-                                            uint64_t *size_out,
+                                            size_t *size_out,
                                             int *n_expired_out)
 {
   if (BUG(!conn))
@@ -3693,8 +3693,9 @@ dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
     }
   } SMARTLIST_FOREACH_END(spooled);
 
-  if (size_out)
-    *size_out = total;
+  if (size_out) {
+    *size_out = (total > SIZE_MAX) ? SIZE_MAX : (size_t)total;
+  }
   if (n_expired_out)
     *n_expired_out = n_expired;
 }
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index 4bc31d8f3b..f707237ed1 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -188,7 +188,7 @@ void spooled_resource_free(spooled_resource_t *spooled);
 void dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
                                                  time_t cutoff,
                                                  int compression,
-                                                 uint64_t *size_out,
+                                                 size_t *size_out,
                                                  int *n_expired_out);
 void dirserv_spool_sort(dir_connection_t *conn);
 void dir_conn_clear_spool(dir_connection_t *conn);