[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  a8da472 idtree: fix overflow for v. large ids on allocation and removal
      from  714c6c4 Updated french translations from Jean Delvare <jdelvare at suse.de>

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit a8da472643c9a9e7babdfcf7b77d1d8a3154101b
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Mon Dec 6 13:35:50 2010 +1030

    idtree: fix overflow for v. large ids on allocation and removal
    
    Chris Cowan tracked down a SEGV in sub_alloc: idp->level can actually
    be equal to 7 (MAX_LEVEL) there, as it can be in sub_remove.
    
    (We unfairly blamed a shift of a signed var for this crash in commit
     2db1987f5a3a).
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    
    Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-Date: Mon Dec  6 05:02:22 CET 2010 on sn-devel-104
    (cherry picked from commit 521e96ca751df072e5c71d3844ed5708b79ac69d)

-----------------------------------------------------------------------

Summary of changes:
 lib/util/idtree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/idtree.c b/lib/util/idtree.c
index 6611992..3648761 100644
--- a/lib/util/idtree.c
+++ b/lib/util/idtree.c
@@ -104,7 +104,7 @@ static int sub_alloc(struct idr_context *idp, void *ptr, int *starting_id)
 {
 	int n, m, sh;
 	struct idr_layer *p, *pn;
-	struct idr_layer *pa[MAX_LEVEL];
+	struct idr_layer *pa[MAX_LEVEL+1];
 	unsigned int l, id, oid;
 	uint32_t bm;
 


-- 
Samba Shared Repository