From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 20:00:10 +0000 (+0000)
Subject: ITS#5748
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~87
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19f3b86c67dbacbf43019fb5149cfcbf2b2a32b7;p=openldap

ITS#5748
---

diff --git a/CHANGES b/CHANGES
index 6c600a049f..49bdce9756 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.13 Engineering
 	Fixed liblutil hex conversion (ITS#5699)
+	Fixed liblutil returning undefined data (ITS#5748)
 	Fixed libldap error code return (ITS#5762)
 	Fixed slapd config backend olcLogFile support (ITS#5765)
 	Added slapd dn.this ACL limits (ITS#5734)
diff --git a/libraries/liblutil/tavl.c b/libraries/liblutil/tavl.c
index 403fa11f47..d64474fe94 100644
--- a/libraries/liblutil/tavl.c
+++ b/libraries/liblutil/tavl.c
@@ -448,13 +448,13 @@ tavl_free( Avlnode *root, AVL_FREE dfree )
 /*
  * tavl_find2 - returns Avlnode instead of data pointer.
  * tavl_find3 - as above, but returns Avlnode even if no match is found.
- *				also return the last comparison result in ret.
+ *				also set *ret = last comparison result, or -1 if root == NULL.
  */
 Avlnode *
 tavl_find3( Avlnode *root, const void *data, AVL_CMP fcmp, int *ret )
 {
-	int	cmp, dir;
-	Avlnode *prev;
+	int	cmp = -1, dir;
+	Avlnode *prev = root;
 
 	while ( root != 0 && (cmp = (*fcmp)( data, root->avl_data )) != 0 ) {
 		prev = root;