[TS-1648] Segmentation fault in dir_clear_range()
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9ad14389 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9ad14389 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9ad14389 Branch: refs/heads/5.0.x Commit: 9ad143897aa4fa914705bc9e8fceaf056a8dbb37 Parents: fed6a5b Author: Brian Geffon <[email protected]> Authored: Thu Jan 16 17:34:27 2014 -0800 Committer: Brian Geffon <[email protected]> Committed: Thu Jan 16 17:34:27 2014 -0800 ---------------------------------------------------------------------- iocore/cache/CacheDir.cc | 2 +- lib/atscppapi/src/Headers.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ad14389/iocore/cache/CacheDir.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc index f1ba72c..d5e7739 100644 --- a/iocore/cache/CacheDir.cc +++ b/iocore/cache/CacheDir.cc @@ -466,7 +466,7 @@ dir_clean_range_interimvol(off_t start, off_t end, InterimCacheVol *svol) void dir_clear_range(off_t start, off_t end, Vol *vol) { - for (int64_t i = 0; i < (int64_t)(vol->buckets * DIR_DEPTH * vol->segments); i++) { + for (off_t i = 0; i < vol->buckets * DIR_DEPTH * vol->segments; i++) { Dir *e = dir_index(vol, i); if (!dir_token(e) && dir_offset(e) >= (int64_t)start && dir_offset(e) < (int64_t)end) { CACHE_DEC_DIR_USED(vol->mutex); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ad14389/lib/atscppapi/src/Headers.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/Headers.cc b/lib/atscppapi/src/Headers.cc index 2c061da..8eb0ce5 100644 --- a/lib/atscppapi/src/Headers.cc +++ b/lib/atscppapi/src/Headers.cc @@ -51,14 +51,14 @@ HeaderFieldName::operator const char*() { return name_.c_str(); } -HeaderFieldName::size_type HeaderFieldName::length() { - return name_.length(); -} - std::string HeaderFieldName::str() { return name_; } +HeaderFieldName::size_type HeaderFieldName::length() { + return name_.length(); +} + const char *HeaderFieldName::c_str() { return name_.c_str(); }
