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__)
#endif
#if WINDOWS
-#define MSIZE(p) _msize (p)
+#define M_SIZE(p) _msize (p)
#endif
-#if LINUX
-/* FIXME: manpage claims that this function is a GNU extension,
- * but googling shows that it is available on many platforms via
- * inclusion of various headers. For now let's make it Linux-only.
- */
-#define MSIZE(p) malloc_usable_size (p)
+#ifdef FREEBSD
+#include <malloc_np.h>
+#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
/**
ptr = &((size_t *) ptr)[-1];
mem_used -= *((size_t *) ptr);
#endif
-#if defined(MSIZE)
+#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;
- char baadfood[5] = BAADFOOD_STR;
- size_t s = MSIZE (ptr);
- for (i = 0; i < s; i++)
- ((char *) ptr)[i] = baadfood[i % 4];
+
+ for (i=0;i<s/8;i++)
+ base[i] = baadfood;
+ memcpy (&base[s/8], &baadfood, s % 8);
}
#endif
#endif
}
+#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'; 'malloc' zeros out anyway */