Mercurial > libavutil.hg

changeset 572:5877edf05eb7 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid undefined behavior for removing elements that were not in the tree.
author michael
date Fri, 19 Sep 2008 12:41:12 +0000
parents 1d948bd9850c
children 1f4b70bcd610
files tree.c tree.h
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tree.c	Mon Sep 15 22:10:28 2008 +0000
+++ b/tree.c	Fri Sep 19 12:41:12 2008 +0000
@@ -119,8 +119,11 @@
         return ret;
     }else{
         *tp= *next; *next= NULL;
-        (*tp)->elem= key;
-        return NULL;
+        if(*tp){
+            (*tp)->elem= key;
+            return NULL;
+        }else
+            return key;
     }
 }
 
@@ -188,8 +191,7 @@
         av_tree_insert(&root, (void*)(j+1), cmp, &node);
 
         j= (random()%86294);
-        k= av_tree_find(root, (void*)(j+1), cmp, NULL);
-        if(k){
+        {
             AVTreeNode *node2=NULL;
             av_log(NULL, AV_LOG_ERROR, "removing %4d\n", j);
             av_tree_insert(&root, (void*)(j+1), cmp, &node2);
--- a/tree.h	Mon Sep 15 22:10:28 2008 +0000
+++ b/tree.h	Fri Sep 19 12:41:12 2008 +0000
@@ -45,8 +45,7 @@
 
 /**
  * Inserts or removes an element.
- * If *next is NULL then the element supplied will be removed, if no such
- * element exists behavior is undefined.
+ * If *next is NULL then the element supplied will be removed if it exists.
  * If *next is not NULL then the element supplied will be inserted, unless
  * it already exists in the tree.
  * @param rootp A pointer to a pointer to the root node of the tree. Note that