Imported Upstream version 2.0.2upstream/2.0.2

1 files changed, 20 insertions, 3 deletions

diff --git a/XAlloc.c b/XAlloc.c
index cc29021..5f2e9a4 100644
--- a/XAlloc.c
+++ b/XAlloc.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 /*{
+#include <assert.h>
 #include <stdlib.h>
 }*/
 
@@ -29,7 +30,7 @@ void* xMalloc(size_t size) {
 
 void* xCalloc(size_t nmemb, size_t size) {
    void* data = calloc(nmemb, size);
-   if (!data) {
+   if (!data && nmemb > 0 && size > 0) {
       fail();
    }
    return data;
@@ -43,9 +44,25 @@ void* xRealloc(void* ptr, size_t size) {
    return data;
 }
 
-char* xStrdup(const char* str) {
+#undef xStrdup
+#undef xStrdup_
+#ifdef NDEBUG
+# define xStrdup_ xStrdup
+#else
+# define xStrdup(str_) (assert(str_), xStrdup_(str_))
+#endif
+
+#ifndef __has_attribute // Clang's macro
+# define __has_attribute(x) 0
+#endif
+#if (__has_attribute(nonnull) || \
+    ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)))
+char* xStrdup_(const char* str) __attribute__((nonnull));
+#endif // __has_attribute(nonnull) || GNU C 3.3 or later
+
+char* xStrdup_(const char* str) {
    char* data = strdup(str);
-   if (!data && str) {
+   if (!data) {
       fail();
    }
    return data;