From e3026ce49a0839dfbe494af7e60d91bc7204f88e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 16 Jun 2012 15:23:06 +0200 Subject: Fix previous commit: Do not call memset() if realloc() returned NULL. --- apt-pkg/contrib/mmap.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 77b4502f5..593bb063b 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -461,10 +461,11 @@ 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; + else + /* Set new memory to 0 */ + memset((char*)Base + WorkSpace, 0, newSize - WorkSpace); } Pools =(Pool*) Base + poolOffset; -- cgit v1.2.3-70-g09d2