Check return of tor_snprintf

svn:r2616

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 506264928a2e860b6e60079b890895f1db927476..790ad4b1caf9219e7c1a95e79e5c1b78dbb52263 100644 (file)
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -237,6 +237,7 @@ void rep_hist_dump_stats(time_t now, int severity)
   double uptime;
   char buffer[2048];
   size_t len;
+  int r;
   unsigned long upt, downt;
   routerinfo_t *r;
 
@@ -279,14 +280,14 @@ void rep_hist_dump_stats(time_t now, int severity)
           name2 = "(unknown)";
 
         link_history = (link_history_t*) link_history_p;
-/* XXX009 tor_snprintf can return -1 for error also. need to detect. */
-        len += tor_snprintf(buffer+len, 2048-len, "%s(%ld/%ld); ", name2,
+        
+        r = tor_snprintf(buffer+len, 2048-len, "%s(%ld/%ld); ", name2,
                         link_history->n_extend_ok,
                         link_history->n_extend_ok+link_history->n_extend_fail);
-        if (len >= 2048) {
-          buffer[2047]='\0';
+        if (r<0)
           break;
-        }
+        else
+          len += r;
       }
       log(severity, "%s", buffer);
     }