From 1b81b95afa8535a5075af2ab37b4da3a94e5a31a Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Tue, 14 Jan 2020 06:17:15 +0100 Subject: [PATCH] introduce safe_malloc0, also 0 the memory before usage note called safe_calloc because calloc does not have the same syntax and this safe_malloc0 uses malloc syntax --- tools/quake3/common/cmdlib.c | 22 ++++++++++++++++++++++ tools/quake3/common/cmdlib.h | 2 ++ 2 files changed, 24 insertions(+) diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c index 32cf7fc0..43bf0a35 100644 --- a/tools/quake3/common/cmdlib.c +++ b/tools/quake3/common/cmdlib.c @@ -69,6 +69,28 @@ void *safe_malloc_info( size_t size, char* info ){ return p; } +void *safe_malloc0( size_t size ){ + void *p; + + p = calloc( 1, size ); + if ( !p ) { + Error( "safe_malloc0 failed on allocation of %i bytes", size ); + } + + return p; +} + +void *safe_malloc0_info( size_t size, char* info ){ + void *p; + + p = calloc( 1, size ); + if ( !p ) { + Error( "%s: safe_malloc0 failed on allocation of %i bytes", info, size ); + } + + return p; +} + // set these before calling CheckParm int myargc; char **myargv; diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h index b49e49c2..ecdcf6e1 100644 --- a/tools/quake3/common/cmdlib.h +++ b/tools/quake3/common/cmdlib.h @@ -66,6 +66,8 @@ void *safe_malloc( size_t size ); void *safe_malloc_info( size_t size, char* info ); +void *safe_malloc0( size_t size ); +void *safe_malloc0_info( size_t size, char* info ); // set these before calling CheckParm extern int myargc; -- 2.39.2