You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/03/08 18:12:28 UTC
[1/2] git commit: TS-1628 in validate_unmapped_url(),
t_state.pristine_url maybe invalid().
TS-1628 in validate_unmapped_url(), t_state.pristine_url maybe invalid().
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b30e6982
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b30e6982
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b30e6982
Branch: refs/heads/master
Commit: b30e6982f777269351078d81b08baaf3d70f2271
Parents: 666fdbe
Author: Bin Chen <ku...@taobao.com>
Authored: Fri Mar 8 10:02:04 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Mar 8 10:02:04 2013 -0700
----------------------------------------------------------------------
proxy/logging/LogAccessHttp.cc | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b30e6982/proxy/logging/LogAccessHttp.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index d198df9..cd945f6 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -180,12 +180,14 @@ void
LogAccessHttp::validate_unmapped_url(void)
{
if (m_client_req_unmapped_url_canon_len < 0) {
- int unmapped_url_len;
- char *unmapped_url = m_http_sm->t_state.pristine_url.string_get_ref(&unmapped_url_len);
+ if (m_http_sm->t_state.pristine_url.valid()) {
+ int unmapped_url_len;
+ char *unmapped_url = m_http_sm->t_state.pristine_url.string_get_ref(&unmapped_url_len);
- if (unmapped_url && unmapped_url[0] != 0) {
- m_client_req_unmapped_url_canon_str =
+ if (unmapped_url && unmapped_url[0] != 0) {
+ m_client_req_unmapped_url_canon_str =
LogUtils::escapify_url(&m_arena, unmapped_url, unmapped_url_len, &m_client_req_unmapped_url_canon_len);
+ }
} else {
m_client_req_unmapped_url_canon_len = 0;
}