Просмотр исходного кода

Merge remote-tracking branch 'origin/maint-0.2.2'

Nick Mathewson 12 лет назад
Родитель
Сommit
29db095a35
2 измененных файлов с 10 добавлено и 2 удалено
  1. 5 0
      changes/bug4529
  2. 5 2
      src/common/address.c

+ 5 - 0
changes/bug4529

@@ -0,0 +1,5 @@
+  o Minor bufixes:
+    - If we had ever tried to call tor_addr_to_str on an address of
+      unknown type, we would have done a strdup on an uninitialized
+      buffer. Now we won't. Fixes bug 4529; bugfix on 0.2.1.3-alpha.
+      Reported by "troll_un".

+ 5 - 2
src/common/address.c

@@ -962,8 +962,11 @@ char *
 tor_dup_addr(const tor_addr_t *addr)
 {
   char buf[TOR_ADDR_BUF_LEN];
-  tor_addr_to_str(buf, addr, sizeof(buf), 0);
-  return tor_strdup(buf);
+  if (tor_addr_to_str(buf, addr, sizeof(buf), 0)) {
+    return tor_strdup(buf);
+  } else {
+    return tor_strdup("<unknown address type>");
+  }
 }
 
 /** Return a string representing the address <b>addr</b>.  This string is