diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-07-30 17:28:44 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2013-07-31 18:14:08 +0200 |
commit | c2e936de07d054bf476e60445b453bf6b4836820 (patch) | |
tree | 5b257ee0968028e750845b2ad7d8387fe678b9eb /libavutil | |
parent | a9b04b2c43f95cc17c2291f83c27a3119471d986 (diff) | |
download | ffmpeg-c2e936de07d054bf476e60445b453bf6b4836820.tar.gz |
tree-test: Refactor and plug memory leaks
With the most annoying memory leak found by Derek Buitenhuis.
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/tree.c | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/libavutil/tree.c b/libavutil/tree.c index aaf2851b10..b419e16ca0 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "error.h" #include "log.h" #include "mem.h" #include "tree.h" @@ -211,32 +212,50 @@ static int cmp(void *a, const void *b) int main(void) { int i; - void *k; AVTreeNode *root = NULL, *node = NULL; AVLFG prng; av_lfg_init(&prng, 1); for (i = 0; i < 10000; i++) { - int j = av_lfg_get(&prng) % 86294; + AVTreeNode *node2 = NULL; + intptr_t j = av_lfg_get(&prng) % 86294; + void *ret, *jj = (void *)(j + 1); + + while (ret = av_tree_find(root, jj, cmp, NULL)) { + j = av_lfg_get(&prng) % 86294; + jj = (void *)(j + 1); + } + if (check(root) > 999) { av_log(NULL, AV_LOG_ERROR, "FATAL error %d\n", i); print(root, 0); return -1; } + if (!node) node = av_tree_node_alloc(); - av_tree_insert(&root, (void *)(j + 1), cmp, &node); - - j = av_lfg_get(&prng) % 86294; - { - AVTreeNode *node2 = NULL; - av_tree_insert(&root, (void *)(j + 1), cmp, &node2); - k = av_tree_find(root, (void *)(j + 1), cmp, NULL); - if (k) - av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i); + if (!node) { + av_log(NULL, AV_LOG_ERROR, "Memory allocation failure.\n"); + return AVERROR(ENOMEM); } + av_tree_insert(&root, jj, cmp, &node); + + while (ret = av_tree_find(root, jj, cmp, NULL)) { + j = av_lfg_get(&prng) % 86294; + jj = (void *)(j + 1); + } + + ret = av_tree_insert(&root, jj, cmp, &node2); + if (ret != jj) + av_tree_destroy(node2); + ret = av_tree_find(root, jj, cmp, NULL); + if (ret) + av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i); } + + av_tree_destroy(root); + return 0; } #endif |