diff options
author | t3sserakt <t3ss@posteo.de> | 2020-07-21 12:30:37 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2020-07-21 12:30:37 +0200 |
commit | 5fa1c7dc809aebb55ef062cb3a2757c54eb6b7e7 (patch) | |
tree | c26167460724fea683ef51a88ffd93d1fa830412 /src/util/common_allocation.c | |
parent | 17d84245fdfeeb1a6da4ffb97898903cb55f702c (diff) | |
parent | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (diff) | |
download | gnunet-5fa1c7dc809aebb55ef062cb3a2757c54eb6b7e7.tar.gz gnunet-5fa1c7dc809aebb55ef062cb3a2757c54eb6b7e7.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/util/common_allocation.c')
-rw-r--r-- | src/util/common_allocation.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index fd91e23b2..4aad49777 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -323,13 +323,12 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber) | |||
323 | * want to keep track of allocations. | 323 | * want to keep track of allocations. |
324 | * | 324 | * |
325 | * @param ptr the pointer to free | 325 | * @param ptr the pointer to free |
326 | * @param filename where in the code was the call to GNUNET_free | 326 | * @param filename where in the code was the call to GNUNET_free() |
327 | * @param linenumber where in the code was the call to GNUNET_free | 327 | * @param linenumber where in the code was the call to GNUNET_free() |
328 | */ | 328 | */ |
329 | void | 329 | void |
330 | GNUNET_xfree_ (void *ptr, const char *filename, int linenumber) | 330 | GNUNET_xfree_ (void *ptr, const char *filename, int linenumber) |
331 | { | 331 | { |
332 | GNUNET_assert_at (NULL != ptr, filename, linenumber); | ||
333 | #ifdef W32_MEM_LIMIT | 332 | #ifdef W32_MEM_LIMIT |
334 | ptr = &((size_t *) ptr)[-1]; | 333 | ptr = &((size_t *) ptr)[-1]; |
335 | mem_used -= *((size_t *) ptr); | 334 | mem_used -= *((size_t *) ptr); |