diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-05-15 20:09:36 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-05-15 20:09:36 +0200 |
commit | 9af213e65c0c4d8daac0e6509c931c6f880ca03c (patch) | |
tree | c900ff9f6a1de89c2ac87378e8225442547d0ba4 /src | |
parent | 706c38e6ad7ee354e83f7f08e3e0c9584ce15631 (diff) | |
parent | b0c9eac44e7f4b1325c91108394c269b2c491fb7 (diff) | |
download | gnunet-9af213e65c0c4d8daac0e6509c931c6f880ca03c.tar.gz gnunet-9af213e65c0c4d8daac0e6509c931c6f880ca03c.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r-- | src/util/common_allocation.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index 215df55d4..308488131 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -327,8 +327,12 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber) | |||
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, |
331 | const char *filename, | ||
332 | int linenumber) | ||
331 | { | 333 | { |
334 | if (NULL == ptr) | ||
335 | return; | ||
332 | #ifdef W32_MEM_LIMIT | 336 | #ifdef W32_MEM_LIMIT |
333 | ptr = &((size_t *) ptr)[-1]; | 337 | ptr = &((size_t *) ptr)[-1]; |
334 | mem_used -= *((size_t *) ptr); | 338 | mem_used -= *((size_t *) ptr); |