From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 23 Jul 2008 22:20:45 +0000 (+0000)
Subject: DEVEL15-windows-btree-enum-20080723
X-Git-Tag: openafs-devel-1_5_51~18
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=57439bc45d6193cb8813c75e6bf16111e64c5c23;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-btree-enum-20080723

LICENSE MIT

Fix next enum to return an invalid param error when beyond the end
of the list.


(cherry picked from commit a9c00f2638d44e1d077fbd953bf153df9cc319c4)
---

diff --git a/src/WINNT/afsd/cm_btree.c b/src/WINNT/afsd/cm_btree.c
index e9018b025..93a2e47fc 100644
--- a/src/WINNT/afsd/cm_btree.c
+++ b/src/WINNT/afsd/cm_btree.c
@@ -2336,11 +2336,11 @@ cm_BPlusDirEnumBulkStat(cm_scache_t *dscp, cm_direnum_t *enump, cm_user_t *userp
 long 
 cm_BPlusDirNextEnumEntry(cm_direnum_t *enump, cm_direnum_entry_t **entrypp)
 {	
-    if (enump == NULL || entrypp == NULL || enump->next > enump->count) {
+    if (enump == NULL || entrypp == NULL || enump->next >= enump->count) {
 	if (entrypp)
 	    *entrypp = NULL;
 	osi_Log0(afsd_logp, "cm_BPlusDirNextEnumEntry invalid input");
-	return CM_ERROR_INVAL;			      \
+	return CM_ERROR_INVAL;
     }
 
     *entrypp = &enump->entry[enump->next++];