zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 from Explorer09/xStrdup 

Fixes upon xStrdup(NULL) problem
This commit is contained in:
Hisham Muhammad 2016-06-02 17:29:14 -03:00
parent ea9dc4ab74 3297616efa
commit f9c1db514d
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
XAlloc.c
View File

@ -5,6 +5,7 @@
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
#include <assert.h>
#include <err.h> #include <err.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -43,10 +44,19 @@ void* xRealloc(void* ptr, size_t size) {
return data; return data;
} }
char* xStrdup(const char* str) { #undef xStrdup
if (!str) { #undef xStrdup_
fail(); #ifdef NDEBUG
} # define xStrdup_ xStrdup
#else
# define xStrdup(str_) (assert(str_), xStrdup_(str_))
#endif
#if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
char* xStrdup_(const char* str) __attribute__((nonnull));
#endif // GNU C 3.3 or later
char* xStrdup_(const char* str) {
char* data = strdup(str); char* data = strdup(str);
if (!data) { if (!data) {
fail(); fail();

14
XAlloc.h
View File

@ -15,6 +15,18 @@ void* xCalloc(size_t nmemb, size_t size);
void* xRealloc(void* ptr, size_t size); void* xRealloc(void* ptr, size_t size);
char* xStrdup(const char* str); #undef xStrdup
#undef xStrdup_
#ifdef NDEBUG
# define xStrdup_ xStrdup
#else
# define xStrdup(str_) (assert(str_), xStrdup_(str_))
#endif
#if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
char* xStrdup_(const char* str) __attribute__((nonnull));
#endif // GNU C 3.3 or later
char* xStrdup_(const char* str);
#endif #endif