projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-remove async ecc key generation, not needed
[oweals/gnunet.git]
/
src
/
util
/
common_allocation.c
diff --git
a/src/util/common_allocation.c
b/src/util/common_allocation.c
index 90af6e0912377a1401b41000f221015ecc7b59eb..dfa65d579dc6b74b0e566e44baff2fc5451dcaa1 100644
(file)
--- a/
src/util/common_allocation.c
+++ b/
src/util/common_allocation.c
@@
-28,6
+28,9
@@
#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#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(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
@@
-192,10
+195,12
@@
GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
#endif
#if WINDOWS
#endif
#if WINDOWS
-#define MSIZE(p) _msize (p)
+#define M
_
SIZE(p) _msize (p)
#endif
#if HAVE_MALLOC_USABLE_SIZE
#endif
#if HAVE_MALLOC_USABLE_SIZE
-#define MSIZE(p) malloc_usable_size (p)
+#define M_SIZE(p) malloc_usable_size (p)
+#elif HAVE_MALLOC_SIZE
+#define M_SIZE(p) malloc_size (p)
#endif
/**
#endif
/**
@@
-214,14
+219,17
@@
GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
ptr = &((size_t *) ptr)[-1];
mem_used -= *((size_t *) ptr);
#endif
ptr = &((size_t *) ptr)[-1];
mem_used -= *((size_t *) ptr);
#endif
-#if defined(MSIZE)
+#if defined(M
_
SIZE)
#if ENABLE_POISONING
{
#if ENABLE_POISONING
{
+ const uint64_t baadfood = GNUNET_ntohll (0xBAADF00DBAADF00DLL);
+ uint64_t *base = ptr;
+ size_t s = M_SIZE (ptr);
size_t i;
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
}
#endif
#endif
@@
-248,6
+256,21
@@
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).
*
/**
* Dup partially a string (same semantics as strndup).
*
@@
-263,8
+286,10
@@
GNUNET_xstrndup_ (const char *str, size_t len, const char *filename,
{
char *res;
{
char *res;
+ if (0 == len)
+ return GNUNET_strdup ("");
GNUNET_assert_at (str != NULL, filename, linenumber);
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 */
res = GNUNET_xmalloc_ (len + 1, filename, linenumber);
memcpy (res, str, len);
/* res[len] = '\0'; 'malloc' zeros out anyway */