[tor-commits] [tor/master] Fix a misuse of strlcpy() introduced by the #11156 patch.

[nickm at torproject.org]

commit a787575b7f2d9bbb8385940977cafcfc87c71234
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu May 1 14:44:29 2014 +0100

    Fix a misuse of strlcpy() introduced by the #11156 patch.
---
 changes/bug11654  |    4 ++++
 src/or/nodelist.c |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/changes/bug11654 b/changes/bug11654
new file mode 100644
index 0000000..97c70b2
--- /dev/null
+++ b/changes/bug11654
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix a broken log message about delayed directory fetches that
+      was caused by a misuse of strlcpy(). Fixes bug 11654; bugfix on
+      0.2.5.3-alpha.
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index a38a6d4..09232f9 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1510,8 +1510,8 @@ update_router_have_minimum_dir_info(void)
   }
 
   if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) {
-    log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg);
-    strlcpy(dir_info_status, "%s",  sizeof(dir_info_status));
+    log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg);
+    strlcpy(dir_info_status, delay_fetches_msg,  sizeof(dir_info_status));
     res = 0;
     goto done;
   }