瀏覽代碼

Merge remote-tracking branch 'public/unsigned-time_t'

Nick Mathewson 11 年之前
父節點
當前提交
63a42b38b1
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 6 0
      changes/warn-unsigned-time_t
  2. 2 2
      src/or/microdesc.c

+ 6 - 0
changes/warn-unsigned-time_t

@@ -1,3 +1,9 @@
+  o Minor bugfixes (portability):
+    - On the chance that somebody manages to build Tor on a
+      platform where time_t is unsigned, correct the way that
+      microdesc_add_to_cache handles negative time arguments. Fix for
+      bug 8042; bugfix on 0.2.3.1-alpha.
+
   o Build improvements:
     - Warn if building on a platform with an unsigned time_t: there
       are too many places where Tor currently assumes that time_t can

+ 2 - 2
src/or/microdesc.c

@@ -135,7 +135,7 @@ get_microdesc_cache(void)
  * ending at <b>eos</b>, and store them in <b>cache</b>.  If <b>no_save</b>,
  * mark them as non-writable to disk.  If <b>where</b> is SAVED_IN_CACHE,
  * leave their bodies as pointers to the mmap'd cache.  If where is
- * <b>SAVED_NOWHERE</b>, do not allow annotations.  If listed_at is positive,
+ * <b>SAVED_NOWHERE</b>, do not allow annotations.  If listed_at is not -1,
  * set the last_listed field of every microdesc to listed_at.  If
  * requested_digests is non-null, then it contains a list of digests we mean
  * to allow, so we should reject any non-requested microdesc with a different
@@ -155,7 +155,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache,
   descriptors = microdescs_parse_from_string(s, eos,
                                              allow_annotations,
                                              copy_body);
-  if (listed_at > 0) {
+  if (listed_at != (time_t)-1) {
     SMARTLIST_FOREACH(descriptors, microdesc_t *, md,
                       md->last_listed = listed_at);
   }