isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert efree() to a macro that just casts to void * and does free().

Browse Source 
If the system free() can't handle free(NULL) this may crash but C89
was a long time ago.
This commit is contained in:
Todd C. Miller
2013-03-07 15:41:34 -05:00
parent d07d453ab5
commit d26c0d87f6
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/alloc.c
View File

@@ -271,13 +271,3 @@ evasprintf(char **ret, const char *format, va_list args)
errorx_nodebug(1, NULL); errorx_nodebug(1, NULL);
return len; return len;
} }
/*
* Wrapper for free(3) so we can depend on C89 semantics.
*/
void
efree(void *ptr)
{
if (ptr != NULL)
free(ptr);
}

4
include/alloc.h
View File

@@ -19,9 +19,11 @@
#include <stdarg.h> #include <stdarg.h>
#undef efree
#define efree(x) free((void *)(x))
int easprintf(char **, const char *, ...) __printflike(2, 3); int easprintf(char **, const char *, ...) __printflike(2, 3);
int evasprintf(char **, const char *, va_list) __printflike(2, 0); int evasprintf(char **, const char *, va_list) __printflike(2, 0);
void efree(void *);
void *ecalloc(size_t, size_t) __malloc_like; void *ecalloc(size_t, size_t) __malloc_like;
void *emalloc(size_t) __malloc_like; void *emalloc(size_t) __malloc_like;
void *emalloc2(size_t, size_t) __malloc_like; void *emalloc2(size_t, size_t) __malloc_like;