From edabf3592610323b7f2cf1bf7c6881ce3b4aebc5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 14 Nov 2009 19:14:14 +0000 Subject: Fix crash with av_tree_enumerate(NULL). Originally committed as revision 20537 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/tree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/tree.c b/libavutil/tree.c index 0781453685..85ef629b98 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -137,10 +137,12 @@ void av_tree_destroy(AVTreeNode *t){ #if 0 void av_tree_enumerate(AVTreeNode *t, void *opaque, int (*cmp)(void *opaque, void *elem), int (*enu)(void *opaque, void *elem)){ + if(t){ int v= cmp ? cmp(opaque, t->elem) : 0; if(v>=0) av_tree_enumerate(t->child[0], opaque, cmp, enu); if(v==0) enu(opaque, t->elem); if(v<=0) av_tree_enumerate(t->child[1], opaque, cmp, enu); + } } #endif -- cgit v1.2.3