summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2012-06-16 14:38:09 +0200
committerJulian Andres Klode <jak@debian.org>2012-06-16 14:38:09 +0200
commit61a406f0fc9c7b1807acb2ff146db6acd18e879c (patch)
tree8e3f2b9534c219fd0ddf645ba852067e7061194f
parent7899a1339ced1e8fa10730e5619349b9fd782fac (diff)
Zero out the new memory allocated with realloc().
-rw-r--r--apt-pkg/contrib/mmap.cc2
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 0 deletions
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 131cefd6e..77b4502f5 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -461,6 +461,8 @@ bool DynamicMMap::Grow() {
return false;
Base = realloc(Base, newSize);
+ /* Set new memory to 0 */
+ memset((char*)Base + WorkSpace, 0, newSize - WorkSpace);
if (Base == NULL)
return false;
}
diff --git a/debian/changelog b/debian/changelog
index 2050cb05a..1cdfbe61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ apt (0.9.7) UNRELEASED; urgency=low
- Fix the Fallback option to work correctly, by not calling
realloc() on a map mapped by mmap(), and by using malloc
and friends instead of new[].
+ - Zero out the new memory allocated with realloc().
-- Julian Andres Klode <jak@debian.org> Sat, 16 Jun 2012 14:28:38 +0200