[src/trunk]: src/common/lib/libc/gen Fix failure case in rb_tree_find_node_le...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86e05e56c1bb
branches:  trunk
changeset: 331744:86e05e56c1bb
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Aug 22 17:17:02 2014 +0000

description:
Fix failure case in rb_tree_find_node_leq/geq.

Return NULL, not `NULL - offset'.

XXX pullup to netbsd-5, netbsd-6, netbsd-7

diffstat:

 common/lib/libc/gen/rb.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r e499ed544ae2 -r 86e05e56c1bb common/lib/libc/gen/rb.c
--- a/common/lib/libc/gen/rb.c  Fri Aug 22 16:49:30 2014 +0000
+++ b/common/lib/libc/gen/rb.c  Fri Aug 22 17:17:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $      */
+/*     $NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,10 +39,10 @@
 #else
 #define KASSERT(s)     do { } while (/*CONSTCOND*/ 0)
 #endif
-__RCSID("$NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $");
+__RCSID("$NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $");
 #else
 #include <lib/libkern/libkern.h>
-__KERNEL_RCSID(0, "$NetBSD: rb.c,v 1.11 2011/06/20 09:11:16 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rb.c,v 1.12 2014/08/22 17:17:02 riastradh Exp $");
 #endif
 
 #ifdef _LIBC
@@ -145,7 +145,7 @@
                parent = parent->rb_nodes[diff < 0];
        }
 
-       return RB_NODETOITEM(rbto, last);
+       return (last == NULL ? NULL : RB_NODETOITEM(rbto, last));
 }
 
 void *
@@ -166,7 +166,7 @@
                parent = parent->rb_nodes[diff < 0];
        }
 
-       return RB_NODETOITEM(rbto, last);
+       return (last == NULL ? NULL : RB_NODETOITEM(rbto, last));
 }
 
 void *