[1/2] git commit: TS-1223: fix the crash in http_ui show network connections

[zy...@apache.org]

Updated Branches:
  refs/heads/master b4d2b8804 -> e827aab3c


TS-1223: fix the crash in http_ui show network connections

  The problem here is a mess up in the using of va_list, aap
  is saved for later checking, and va_scratch is for printf.

  Thanks to Weijin for the carefully review.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e827aab3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e827aab3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e827aab3

Branch: refs/heads/master
Commit: e827aab3ca5d1f081d68275f8de28ae8072a06df
Parents: 04259ec
Author: Chen Bin <ku...@taobao.com>
Authored: Tue Oct 23 15:11:05 2012 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Tue Oct 23 15:40:32 2012 +0800

----------------------------------------------------------------------
 CHANGES      |    2 ++
 proxy/Show.h |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e827aab3/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2752d36..9705af5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.3.1
 
+  *) [TS-1223] fix the crash in http_ui show network connections
+
   *) [TS-1543] Enable non-debug logging for rfc5861 plugin
 
   *) [TS-1512] get volume & hosting work with cluster

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e827aab3/proxy/Show.h
----------------------------------------------------------------------
diff --git a/proxy/Show.h b/proxy/Show.h
index 322812d..1387b87 100644
--- a/proxy/Show.h
+++ b/proxy/Show.h
@@ -50,7 +50,7 @@ struct ShowCont: public Continuation
     int l = ebuf - buf;
     va_start(aap, s);
     va_copy(va_scratch, aap);
-    int done = vsnprintf(buf, l, s, aap);
+    int done = vsnprintf(buf, l, s, va_scratch);
     va_end(va_scratch);
     if (done > l - 256)
     {