GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* @brief wrapper around malloc/free
* @author Christian Grothoff
*/
-
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.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
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;
}
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;
return NULL;
#endif
- GNUNET_assert_at (size < INT_MAX, filename, linenumber);
result = malloc (size);
if (result == NULL)
return NULL;
ptr = realloc (ptr, n);
if ((NULL == ptr) && (n > 0))
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "realloc");
- abort ();
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc");
+ GNUNET_abort ();
}
#ifdef W32_MEM_LIMIT
ptr = &((size_t *) ptr)[1];
}
+# 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.
#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);
}
}
+#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).
*
{
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;
}
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 */