-code deduplication in rsa sign/verify code

[oweals/gnunet.git] / src / util / common_allocation.c

diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 340ad53346da13e7f513ecbecbc65a3fc2cb09ee..ab8715a6d27d4789093ee24e8d325a41c7900bcd 100644 (file)
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -23,9 +23,14 @@
  * @brief wrapper around malloc/free
  * @author Christian Grothoff
  */
-
 #include "platform.h"
 #include "gnunet_common.h"
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#if HAVE_MALLOC_MALLOC_H
+#include <malloc/malloc.h>
+#endif
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
 
@@ -67,7 +72,7 @@ GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
   if (ret == NULL)
   {
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
-    abort ();
+    GNUNET_abort ();
   }
   return ret;
 }
@@ -103,7 +108,7 @@ GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename,
   if (ret == NULL)
   {
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
-    abort ();
+    GNUNET_abort ();
   }
 #ifdef W32_MEM_LIMIT
   *((size_t *) ret) = size;
@@ -136,7 +141,6 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
     return NULL;
 #endif
 
-  GNUNET_assert_at (size < INT_MAX, filename, linenumber);
   result = malloc (size);
   if (result == NULL)
     return NULL;
@@ -174,7 +178,7 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
   if ((NULL == ptr) && (n > 0))
   {
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc");
-    abort ();
+    GNUNET_abort ();
   }
 #ifdef W32_MEM_LIMIT
   ptr = &((size_t *) ptr)[1];
@@ -183,6 +187,22 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
 }
 
 
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+#define BAADFOOD_STR "\x0D\xF0\xAD\xBA"
+#endif
+# if __BYTE_ORDER == __BIG_ENDIAN
+#define BAADFOOD_STR "\xBA\xAD\xF0\x0D"
+#endif
+
+#if WINDOWS
+#define M_SIZE(p) _msize (p)
+#endif
+#if HAVE_MALLOC_USABLE_SIZE
+#define M_SIZE(p) malloc_usable_size (p)
+#elif HAVE_MALLOC_SIZE
+#define M_SIZE(p) malloc_size (p)
+#endif
+
 /**
  * Free memory. Merely a wrapper for the case that we
  * want to keep track of allocations.
@@ -198,6 +218,17 @@ GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
 #ifdef W32_MEM_LIMIT
   ptr = &((size_t *) ptr)[-1];
   mem_used -= *((size_t *) ptr);
+#endif
+#if defined(M_SIZE)
+#if ENABLE_POISONING
+  {
+    size_t i;
+    char baadfood[5] = BAADFOOD_STR;
+    size_t s = M_SIZE (ptr);
+    for (i = 0; i < s; i++)
+      ((char *) ptr)[i] = baadfood[i % 4];
+  }
+#endif
 #endif
   free (ptr);
 }
@@ -241,7 +272,7 @@ GNUNET_xstrndup_ (const char *str, size_t len, const char *filename,
   len = GNUNET_MIN (len, strlen (str));
   res = GNUNET_xmalloc_ (len + 1, filename, linenumber);
   memcpy (res, str, len);
-  res[len] = '\0';
+  /* res[len] = '\0'; 'malloc' zeros out anyway */
   return res;
 }