1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
Author: Timo Teras <timo.teras@iki.fi>
Reported upstream:
http://bugs.squid-cache.org/show_bug.cgi?id=3537
diff --git a/src/StatHist.cc b/src/StatHist.cc
index 9e5d0dd..6aeea49 100644
--- a/src/StatHist.cc
+++ b/src/StatHist.cc
@@ -62,8 +62,8 @@ StatHist::init(unsigned int newCapacity, hbase_f * val_in_, hbase_f * val_out_,
void
StatHist::clear()
{
- for (unsigned int i=0; i<capacity_; ++i)
- bins[i]=0;
+ xfree(bins);
+ bins = NULL;
}
StatHist::StatHist(const StatHist &src) :
@@ -71,7 +71,7 @@ StatHist::StatHist(const StatHist &src) :
scale_(src.scale_), val_in(src.val_in), val_out(src.val_out)
{
if (src.bins!=NULL) {
- bins = static_cast<bins_type *>(xcalloc(src.capacity_, sizeof(int)));
+ bins = static_cast<bins_type *>(xcalloc(src.capacity_, sizeof(bins_type)));
memcpy(bins,src.bins,capacity_*sizeof(*bins));
}
}
diff --git a/src/StatHist.h b/src/StatHist.h
index 576525d..0dbe783 100644
--- a/src/StatHist.h
+++ b/src/StatHist.h
@@ -130,9 +130,11 @@ StatHist::operator =(const StatHist & src)
{
if (this==&src) //handle self-assignment
return *this;
- xfree(bins); // xfree can handle NULL pointers, no need to check
- capacity_=src.capacity_;
- bins = static_cast<bins_type *>(xcalloc(src.capacity_, sizeof(bins_type)));
+ if (capacity_ != src.capacity_ || bins == NULL) {
+ xfree(bins); // xfree can handle NULL pointers, no need to check
+ capacity_=src.capacity_;
+ bins = static_cast<bins_type *>(xcalloc(src.capacity_, sizeof(bins_type)));
+ }
min_=src.min_;
max_=src.max_;
scale_=src.scale_;
|
