From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Fri, 30 Apr 2010 13:59:24 +0000 (-0400)
Subject: Fix archive_rb_iterate for the min/max case.
X-Git-Tag: v3.0.0a~1048
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12c80343666904017db648c73067bc455526c696;p=thirdparty%2Flibarchive.git

Fix archive_rb_iterate for the min/max case.

SVN-Revision: 2345
---

diff --git a/libarchive/archive_rb.c b/libarchive/archive_rb.c
index df32724ad..6ced05f65 100644
--- a/libarchive/archive_rb.c
+++ b/libarchive/archive_rb.c
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * Based on: NetBSD: rb.c,v 1.4 2009/05/19 22:48:19 yamt Exp
+ * Based on: NetBSD: rb.c,v 1.6 2010/04/30 13:58:09 joerg Exp
  */
 
 #include "archive_platform.h"
@@ -675,8 +675,8 @@ __archive_rb_tree_iterate(struct archive_rb_tree *rbt,
 		self = rbt->rbt_root;
 		if (RB_SENTINEL_P(self))
 			return NULL;
-		while (!RB_SENTINEL_P(self->rb_nodes[other]))
-			self = self->rb_nodes[other];
+		while (!RB_SENTINEL_P(self->rb_nodes[direction]))
+			self = self->rb_nodes[direction];
 		return self;
 	}
 	/*