aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-03-10 16:35:12 +0000
committerlloyd <[email protected]>2010-03-10 16:35:12 +0000
commitffebc65a41fbe22934830203cfa4ee791804796b (patch)
tree8ce04eba960bd524f58e096ac979e7f639696c6a /src/alloc
parentd3e279ec353133e9f80f13a536aae15e49c2a206 (diff)
parentfd79f63a44ad0b59507ac67bdb3eccbe4d45adbc (diff)
propagate from branch 'net.randombit.botan' (head 74e9e8642943d126a5e5efa5be1da8351f0fb6d7)
to branch 'net.randombit.botan.c++0x' (head 24371f742c2a1c7e5f3aace364fbb21e01c94657)
Diffstat (limited to 'src/alloc')
-rw-r--r--src/alloc/secmem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc/secmem.h b/src/alloc/secmem.h
index fd08c6198..42b5c7a2d 100644
--- a/src/alloc/secmem.h
+++ b/src/alloc/secmem.h
@@ -210,7 +210,7 @@ class MemoryRegion
}
void deallocate(T* p, u32bit n)
- { alloc->deallocate(p, sizeof(T)*n); }
+ { if(alloc && p && n) alloc->deallocate(p, sizeof(T)*n); }
T* buf;
u32bit used;