diff options
author | Petri Lehtinen <petri@digip.org> | 2013-11-14 08:49:24 +0200 |
---|---|---|
committer | Petri Lehtinen <petri@digip.org> | 2013-11-14 08:49:24 +0200 |
commit | 34d8b92dcecb6dd79fbc0ae878ca3ae7cef07afb (patch) | |
tree | e0bacd9517a611a864d03f16ef7af8249b4ce56e | |
parent | 30a4c88843788e2fd5155816fcc10539e277400b (diff) | |
parent | 67a7bc7376530ce942365a5a9d4f22a5ff6ea007 (diff) | |
download | jansson-34d8b92dcecb6dd79fbc0ae878ca3ae7cef07afb.zip jansson-34d8b92dcecb6dd79fbc0ae878ca3ae7cef07afb.tar.gz jansson-34d8b92dcecb6dd79fbc0ae878ca3ae7cef07afb.tar.bz2 |
Merge branch '2.5'
-rw-r--r-- | doc/apiref.rst | 2 | ||||
-rw-r--r-- | test/suites/api/test_memory_funcs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/apiref.rst b/doc/apiref.rst index 5424af9..13b7901 100644 --- a/doc/apiref.rst +++ b/doc/apiref.rst @@ -1538,7 +1538,7 @@ JSON structures by zeroing all memory when freed:: ptr -= 8; size = *((size_t *)ptr); - guaranteed_memset(ptr, 0, size); + guaranteed_memset(ptr, 0, size + 8); free(ptr); } diff --git a/test/suites/api/test_memory_funcs.c b/test/suites/api/test_memory_funcs.c index 4d6a81e..8737389 100644 --- a/test/suites/api/test_memory_funcs.c +++ b/test/suites/api/test_memory_funcs.c @@ -65,7 +65,7 @@ static void secure_free(void *ptr) ptr = (char *)ptr - 8; size = *((size_t *)ptr); - /*guaranteed_*/memset(ptr, 0, size); + /*guaranteed_*/memset(ptr, 0, size + 8); free(ptr); } |