From ae75d50395fdd7a6bc382ba73e923c460764c702 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 21 Mar 2015 09:28:07 -0700 Subject: Add no-fail equivalents of allocarray & reallocarray v2: Remove extra 's' from comment Signed-off-by: Alan Coopersmith Reviewed-by: Matt Turner --- include/os.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/os.h b/include/os.h index 263374185..6638c8443 100644 --- a/include/os.h +++ b/include/os.h @@ -76,6 +76,8 @@ typedef struct _NewClientRec *NewClientPtr; #define xnfstrdup(s) XNFstrdup(s) #define xallocarray(num, size) reallocarray(NULL, (num), (size)) +#define xnfallocarray(num, size) XNFreallocarray(NULL, (num), (size)) +#define xnfreallocarray(ptr, num, size) XNFreallocarray((ptr), (num), (size)) #endif #include @@ -240,6 +242,13 @@ XNFcallocarray(size_t nmemb, size_t size); extern _X_EXPORT void * XNFrealloc(void * /*ptr */ , unsigned long /*amount */ ); +/* + * This function reallocarray(3)s passed buffer, terminating the server if + * there is not enough memory or the arguments overflow when multiplied. + */ +extern _X_EXPORT void * +XNFreallocarray(void *ptr, size_t nmemb, size_t size); + /* * This function strdup(3)s passed string. The only difference from the library * function that it is safe to pass NULL, as NULL will be returned. -- cgit v1.2.3