You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/11/10 01:41:17 UTC
trafficserver git commit: TS-4004: ASAN crash while running
regression test Cache_vol
Repository: trafficserver
Updated Branches:
refs/heads/master 07c1b3c6e -> 02fe08ee9
TS-4004: ASAN crash while running regression test Cache_vol
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/02fe08ee
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/02fe08ee
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/02fe08ee
Branch: refs/heads/master
Commit: 02fe08ee9e2b38811d0569d9ad39325932447664
Parents: 07c1b3c
Author: Bryan Call <bc...@apache.org>
Authored: Mon Nov 9 16:39:05 2015 -0800
Committer: Bryan Call <bc...@apache.org>
Committed: Mon Nov 9 16:39:05 2015 -0800
----------------------------------------------------------------------
iocore/cache/Cache.cc | 1 +
iocore/cache/CacheDisk.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02fe08ee/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 1fa4284..882bd4c 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -2723,6 +2723,7 @@ cplist_update()
config_vol->cachep = cp;
} else {
cp->disk_vols[d_no]->disk->delete_volume(cp->vol_number);
+ cp->disk_vols[d_no] = NULL;
}
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02fe08ee/iocore/cache/CacheDisk.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheDisk.cc b/iocore/cache/CacheDisk.cc
index 492621d..9b2c594 100644
--- a/iocore/cache/CacheDisk.cc
+++ b/iocore/cache/CacheDisk.cc
@@ -328,7 +328,7 @@ CacheDisk::delete_volume(int number)
free_blocks->size += disk_vols[i]->size;
delete disk_vols[i];
- disk_vols[i] = NULL;
+
/* move all the other disk vols */
for (unsigned int j = i; j < (header->num_volumes - 1); j++) {
disk_vols[j] = disk_vols[j + 1];