Commit 31865567 authored by Timo Teräs's avatar Timo Teräs

main/squid: fix a memory leak

Ref #1054 - this hopefully fixes the bug, but further testing is
needed to verify it. Valgrind traces look optimistic.

Fix authored by me; and reported also to upstream:
http://bugs.squid-cache.org/show_bug.cgi?id=3537
parent e2c73b39
......@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squid
pkgver=3.2.0.17
pkgrel=0
pkgrel=1
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
install="squid.pre-install squid.pre-upgrade"
......@@ -20,6 +20,7 @@ langdir="/usr/share/squid/errors"
source="http://www.squid-cache.org/Versions/v3/3.2/squid-$pkgver.tar.bz2
squid-3.2.0.16-loggable-urlgroup.patch
squid-3.2-stathist-memleak.patch
cf_gen-pthread.patch
squid.initd
squid.confd
......@@ -105,6 +106,7 @@ squid_kerb_auth() {
md5sums="8e38fa22983e0611389e49ecdda42b85 squid-3.2.0.17.tar.bz2
16e3b38996d4c5858e1478f8eb650876 squid-3.2.0.16-loggable-urlgroup.patch
020b2500c46300a83d491ba711ebb91a squid-3.2-stathist-memleak.patch
c60237de253c02937f272d3b189d7679 cf_gen-pthread.patch
905e57c6d41414f54a75a5c0f9f7fac7 squid.initd
2897c725c201be53d3c9a7db0101bdf0 squid.confd
......
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_;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment