mirror of https://github.com/xzeldon/htop.git
Merge pull request #504 from Explorer09/xStrdup
Fixes upon xStrdup(NULL) problem
This commit is contained in:
commit
f9c1db514d
18
XAlloc.c
18
XAlloc.c
|
@ -5,6 +5,7 @@
|
|||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
#include <assert.h>
|
||||
#include <err.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -43,10 +44,19 @@ void* xRealloc(void* ptr, size_t size) {
|
|||
return data;
|
||||
}
|
||||
|
||||
char* xStrdup(const char* str) {
|
||||
if (!str) {
|
||||
fail();
|
||||
}
|
||||
#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) {
|
||||
char* data = strdup(str);
|
||||
if (!data) {
|
||||
fail();
|
||||
|
|
14
XAlloc.h
14
XAlloc.h
|
@ -15,6 +15,18 @@ void* xCalloc(size_t nmemb, 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
|
||||
|
|
Loading…
Reference in New Issue