[trafficserver] 01/01: Merge pull request #721 from bryancall/TS-4470

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit ceec590f76bca2b38f3e3f0cad47a6ee077223e0
Merge: 7ec0d8d 9154211
Author: Bryan Call <br...@yahoo.com>
AuthorDate: Mon Jun 20 08:52:37 2016 -0700

    Merge pull request #721 from bryancall/TS-4470
    
    TS-4470: ASAN stack-buffer-overflow when slow log is enabled

 proxy/http/HttpSM.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc proxy/http/HttpSM.cc
index fd46344,0d1c61e..d4490ba
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@@ -6885,12 -6885,13 +6885,13 @@@ HttpSM::update_stats(
  
    // print slow requests if the threshold is set (> 0) and if we are over the time threshold
    if (t_state.txn_conf->slow_log_threshold != 0 && ink_hrtime_from_msec(t_state.txn_conf->slow_log_threshold) < total_time) {
 -    URL *url = t_state.hdr_info.client_request.url_get();
 +    URL *url             = t_state.hdr_info.client_request.url_get();
      char url_string[256] = "";
 -    int offset = 0;
 -    int skip = 0;
 +    int offset           = 0;
 +    int skip             = 0;
  
-     t_state.hdr_info.client_request.url_print(url_string, sizeof url_string, &offset, &skip);
+     t_state.hdr_info.client_request.url_print(url_string, sizeof(url_string), &offset, &skip);
+     url_string[sizeof(url_string) - 1] = 0; // NULL terminate the string
  
      // unique id
      char unique_id_string[128] = "";

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.