Updated Branches: refs/heads/master 6f261390e -> 1abf9bc61
TS-1171: http_ui cache lookup, double free This is a fix for the change included in bd304288b55e989ff94819818aae93c48cc0c685 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1abf9bc6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1abf9bc6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1abf9bc6 Branch: refs/heads/master Commit: 1abf9bc6179b6e0ccb851c334da1d81bc65cccbc Parents: 6f26139 Author: Zhao Yongming <[email protected]> Authored: Fri Mar 30 01:21:06 2012 +0800 Committer: Zhao Yongming <[email protected]> Committed: Fri Mar 30 01:26:19 2012 +0800 ---------------------------------------------------------------------- CHANGES | 1 + iocore/cache/CachePages.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1abf9bc6/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2aa958c..1b7b207 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.1.4 + *) [TS-1171] http_ui cache lookup, double free. *) [TS-1168] Change UrlRewrite::BuildTable to be IPv6 compliant. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1abf9bc6/iocore/cache/CachePages.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CachePages.cc b/iocore/cache/CachePages.cc index e08eae3..c6df34d 100644 --- a/iocore/cache/CachePages.cc +++ b/iocore/cache/CachePages.cc @@ -101,7 +101,7 @@ struct ShowCache: public ShowCont { } // initialize url array show_cache_urlstrs = NEW(new char[nstrings + 1][500]); - memset(show_cache_urlstrs, '\0', (nstrings + 1) * 500 * sizeof (char *)); + memset(show_cache_urlstrs, '\0', (nstrings + 1) * 500 * sizeof (char)); char *q, *t; p = strstr(unescapedQuery, "url=");
