From f1e4914b5f379f9821274e8ddc4196b152fcc9b0 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 8 Dec 2007 14:50:41 +0000 Subject: (svn r11597) -Change: replace all remaining instances of (re|m|c)alloc with (Re|M|C)allocT and add a check for out-of-memory situations to the *allocT functions. --- src/misc/blob.hpp | 2 +- src/misc/fixedsizearray.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/misc') diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp index 78cac0f72..fd08385f8 100644 --- a/src/misc/blob.hpp +++ b/src/misc/blob.hpp @@ -298,7 +298,7 @@ public: /** all allocation should happen here */ static FORCEINLINE CHdr* RawAlloc(bsize_t num_bytes) { - return (CHdr*)malloc(num_bytes); + return (CHdr*)MallocT(num_bytes); } /** all deallocations should happen here */ diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp index ee4ea14ca..d0a987e1a 100644 --- a/src/misc/fixedsizearray.hpp +++ b/src/misc/fixedsizearray.hpp @@ -34,7 +34,7 @@ struct CFixedSizeArrayT { CFixedSizeArrayT() { // allocate block for header + items (don't construct items) - m_items = (Titem*)(((int8*)malloc(ThdrSize + Tcapacity * sizeof(Titem))) + ThdrSize); + m_items = (Titem*)((MallocT(ThdrSize + Tcapacity * sizeof(Titem))) + ThdrSize); SizeRef() = 0; // initial number of items RefCnt() = 1; // initial reference counter } -- cgit v1.2.3-54-g00ecf