X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fcommon_allocation.c;h=dfa65d579dc6b74b0e566e44baff2fc5451dcaa1;hb=72c8645af31896829b674b575c5375706f362a30;hp=40ffe8c61b23217c7de383a760cacad79110d0e6;hpb=6180140e3395ebec3c1e2ae50cd07f0feda24b40;p=oweals%2Fgnunet.git

diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 40ffe8c61..dfa65d579 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -23,9 +23,18 @@
  * @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__)
+
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
 
 #ifndef INT_MAX
 #define INT_MAX 0x7FFFFFFF
@@ -55,15 +64,16 @@ void *
 GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
 {
   void *ret;
+
   /* As a security precaution, we generally do not allow very large
-     allocations using the default 'GNUNET_malloc' macro */
+   * allocations using the default 'GNUNET_malloc' macro */
   GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
   ret = GNUNET_xmalloc_unchecked_ (size, filename, linenumber);
   if (ret == NULL)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "malloc");
-      abort ();
-    }
+  {
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
+    GNUNET_abort ();
+  }
   return ret;
 }
 
@@ -79,11 +89,14 @@ GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
  * @param linenumber line where this call is being made (for debugging)
  * @return allocated memory, never NULL
  */
-void *GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename, int linenumber)
+void *
+GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename,
+                 int linenumber)
 {
   void *ret;
+
   /* As a security precaution, we generally do not allow very large
-     allocations here */
+   * allocations here */
   GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
 #ifdef W32_MEM_LIMIT
   size += sizeof (size_t);
@@ -93,10 +106,10 @@ void *GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename, int l
   GNUNET_assert_at (size < INT_MAX, filename, linenumber);
   ret = malloc (size);
   if (ret == NULL)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "malloc");
-      abort ();
-    }
+  {
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
+    GNUNET_abort ();
+  }
 #ifdef W32_MEM_LIMIT
   *((size_t *) ret) = size;
   ret = &((size_t *) ret)[1];
@@ -128,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;
@@ -155,9 +167,7 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
  * @return pointer to size bytes of memory
  */
 void *
-GNUNET_xrealloc_ (void *ptr,
-                  size_t n,
-                  const char *filename, int linenumber)
+GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
 {
 #ifdef W32_MEM_LIMIT
   n += sizeof (size_t);
@@ -165,11 +175,11 @@ GNUNET_xrealloc_ (void *ptr,
   mem_used = mem_used - *((size_t *) ptr) + n;
 #endif
   ptr = realloc (ptr, n);
-  if ( (NULL == ptr) && (n > 0) )
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "realloc");
-      abort ();
-    }
+  if ((NULL == ptr) && (n > 0))
+  {
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc");
+    GNUNET_abort ();
+  }
 #ifdef W32_MEM_LIMIT
   ptr = &((size_t *) ptr)[1];
 #endif
@@ -177,6 +187,22 @@ GNUNET_xrealloc_ (void *ptr,
 }
 
 
+# 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.
@@ -192,6 +218,20 @@ 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
+  {
+    const uint64_t baadfood = GNUNET_ntohll (0xBAADF00DBAADF00DLL);
+    uint64_t *base = ptr;
+    size_t s = M_SIZE (ptr);  
+    size_t i;
+    
+    for (i=0;i<s/8;i++)
+      base[i] = baadfood;
+    memcpy (&base[s/8], &baadfood, s % 8);
+  }
+#endif
 #endif
   free (ptr);
 }
@@ -216,25 +256,43 @@ GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber)
 }
 
 
+#if ! HAVE_STRNLEN
+static size_t
+strnlen (const char *s, 
+	 size_t n)
+{
+  const char *e;
+
+  e = memchr (s, '\0', n);
+  if (NULL == e)
+    return n;
+  return e - s;
+}
+#endif
+
+
 /**
  * Dup partially a string (same semantics as strndup).
  *
  * @param str the string to dup
- * @param len the lenght of the string to dup
+ * @param len the length of the string to dup
  * @param filename where in the code was the call to GNUNET_strndup
  * @param linenumber where in the code was the call to GNUNET_strndup
  * @return strndup(str,len)
  */
 char *
-GNUNET_xstrndup_ (const char *str, size_t len, const char *filename, int linenumber)
+GNUNET_xstrndup_ (const char *str, size_t len, const char *filename,
+                  int linenumber)
 {
   char *res;
 
+  if (0 == len)
+    return GNUNET_strdup ("");
   GNUNET_assert_at (str != NULL, filename, linenumber);
-  len = GNUNET_MIN(len,strlen(str));
+  len = strnlen (str, len);
   res = GNUNET_xmalloc_ (len + 1, filename, linenumber);
   memcpy (res, str, len);
-  res[len] = '\0';
+  /* res[len] = '\0'; 'malloc' zeros out anyway */
   return res;
 }
 
@@ -252,9 +310,7 @@ GNUNET_xstrndup_ (const char *str, size_t len, const char *filename, int linenum
  * @param linenumber where in the code was the call to GNUNET_array_grow
  */
 void
-GNUNET_xgrow_ (void **old,
-               size_t elementSize,
-               unsigned int *oldCount,
+GNUNET_xgrow_ (void **old, size_t elementSize, unsigned int *oldCount,
                unsigned int newCount, const char *filename, int linenumber)
 {
   void *tmp;
@@ -263,22 +319,22 @@ GNUNET_xgrow_ (void **old,
   GNUNET_assert_at (INT_MAX / elementSize > newCount, filename, linenumber);
   size = newCount * elementSize;
   if (size == 0)
-    {
-      tmp = NULL;
-    }
+  {
+    tmp = NULL;
+  }
   else
-    {
-      tmp = GNUNET_xmalloc_ (size, filename, linenumber);
-      memset (tmp, 0, size);    /* client code should not rely on this, though... */
-      if (*oldCount > newCount)
-        *oldCount = newCount;   /* shrink is also allowed! */
-      memcpy (tmp, *old, elementSize * (*oldCount));
-    }
+  {
+    tmp = GNUNET_xmalloc_ (size, filename, linenumber);
+    memset (tmp, 0, size);      /* client code should not rely on this, though... */
+    if (*oldCount > newCount)
+      *oldCount = newCount;     /* shrink is also allowed! */
+    memcpy (tmp, *old, elementSize * (*oldCount));
+  }
 
   if (*old != NULL)
-    {
-      GNUNET_xfree_ (*old, filename, linenumber);
-    }
+  {
+    GNUNET_xfree_ (*old, filename, linenumber);
+  }
   *old = tmp;
   *oldCount = newCount;
 }
@@ -331,4 +387,25 @@ GNUNET_snprintf (char *buf, size_t size, const char *format, ...)
   return ret;
 }
 
+
+/**
+ * Create a copy of the given message.
+ *
+ * @param msg message to copy
+ * @return duplicate of the message
+ */
+struct GNUNET_MessageHeader *
+GNUNET_copy_message (const struct GNUNET_MessageHeader *msg)
+{
+  struct GNUNET_MessageHeader *ret;
+  uint16_t msize;
+
+  msize = ntohs (msg->size);
+  GNUNET_assert (msize >= sizeof (struct GNUNET_MessageHeader));
+  ret = GNUNET_malloc (msize);
+  memcpy (ret, msg, msize);
+  return ret;
+}
+
+
 /* end of common_allocation.c */