[FFmpeg-cvslog] r20537 - trunk/libavutil/tree.c

michael subversion
Sat Nov 14 20:14:14 CET 2009


Author: michael
Date: Sat Nov 14 20:14:14 2009
New Revision: 20537

Log:
Fix crash with av_tree_enumerate(NULL).

Modified:
   trunk/libavutil/tree.c

Modified: trunk/libavutil/tree.c
==============================================================================
--- trunk/libavutil/tree.c	Sat Nov 14 12:49:48 2009	(r20536)
+++ trunk/libavutil/tree.c	Sat Nov 14 20:14:14 2009	(r20537)
@@ -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
 



More information about the ffmpeg-cvslog mailing list