Attachment 313970 Details for Bug 458675 – diffs

[patch] diffs

diffs.bug458675 (text/plain), 2.99 KB, created by Rich Megginson on 2008-08-11 14:38:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-08-11 14:38:10 UTC

Size: 2.99 KB

patch

obsolete

>Index: ldapserver/ldap/servers/slapd/valueset.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/valueset.c,v
>retrieving revision 1.8
>diff -u -8 -r1.8 valueset.c
>--- ldapserver/ldap/servers/slapd/valueset.c	2 Jul 2008 18:15:22 -0000	1.8
>+++ ldapserver/ldap/servers/slapd/valueset.c	9 Aug 2008 15:13:02 -0000
>@@ -306,30 +306,35 @@
> 			(*bvals)[i] = ber_bvdup(slapi_value_get_berval(cvals[i]));
>     	}
>     	(*bvals)[i] = NULL;
> 	}
>     return(0);
> }
> 
> void
>-valuearray_free(Slapi_Value ***va)
>+valuearray_free_ext(Slapi_Value ***va, int idx)
> {
> 	if(va!=NULL && *va!=NULL)
> 	{
>-		int i;
>-		for(i=0; (*va)[i]!=NULL; i++)
>+		for(; (*va)[idx]!=NULL; idx++)
> 		{
>-			slapi_value_free(&(*va)[i]);
>+			slapi_value_free(&(*va)[idx]);
> 		}
> 		slapi_ch_free((void **)va);
> 		*va = NULL;
> 	}
> }
> 
>+void
>+valuearray_free(Slapi_Value ***va)
>+{
>+    valuearray_free_ext(va, 0);
>+}
>+
> int
> valuearray_next_value( Slapi_Value **va, int index, Slapi_Value **v)
> {
> 	int r= -1;
> 	if(va!=NULL && va[0]!=NULL)
> 	{
> 		r= index+1;
> 		*v= va[r];
>@@ -658,17 +663,22 @@
> 						}
> 					}
> 					else
> 					{
> 						keyvals[i]= NULL;
> 					}
> 				}
> 			}
>-			valuearray_free( &keyvals );
>+			/* start freeing at index i - the rest of them have already
>+			   been moved into valuetreep
>+			   the loop iteration will always do the +1, so we have
>+			   to remove it if so */
>+			i = (i > 0) ? i-1 : 0;
>+			valuearray_free_ext( &keyvals, i );
> 		}
> 	}
> 	if(rc!=0)
> 	{
> 		valuetree_free( valuetreep );
> 	}
> 
> 	return rc;
>@@ -1116,18 +1126,18 @@
> 					if(rc==LDAP_SUCCESS)
> 					{
> 						if(vs->va[index]!=NULL)
> 						{
> 							/* Move the value to be removed to the out array */
> 							if ( va_out )
> 							{
> 								if (vs->va[index]->v_csnset &&
>-									(flags & SLAPI_VALUE_FLAG_PRESERVECSNSET|
>-											 SLAPI_VALUE_FLAG_USENEWVALUE))
>+									(flags & (SLAPI_VALUE_FLAG_PRESERVECSNSET|
>+                                              SLAPI_VALUE_FLAG_USENEWVALUE)))
> 								{
> 									valuestodelete[i]->v_csnset = csnset_dup (vs->va[index]->v_csnset);
> 								}
> 								if (flags & SLAPI_VALUE_FLAG_USENEWVALUE)
> 								{
> 									valuearrayfast_add_value_passin(&vaf_out,valuestodelete[i]);
> 									valuestodelete[i] = vs->va[index];
> 									vs->va[index] = NULL;
>@@ -1187,18 +1197,18 @@
> 			for ( i = 0; rc==LDAP_SUCCESS && valuestodelete[i] != NULL; ++i )
> 			{
> 				Slapi_Value *found= valueset_remove_value(a, vs, valuestodelete[i]);
> 				if(found!=NULL)
> 				{
> 					if ( va_out )
> 					{
> 						if (found->v_csnset &&
>-							(flags & SLAPI_VALUE_FLAG_PRESERVECSNSET|
>-							 		 SLAPI_VALUE_FLAG_USENEWVALUE))
>+							(flags & (SLAPI_VALUE_FLAG_PRESERVECSNSET|
>+                                      SLAPI_VALUE_FLAG_USENEWVALUE)))
> 						{
> 							valuestodelete[i]->v_csnset = csnset_dup (found->v_csnset);
> 						}
> 						if (flags & SLAPI_VALUE_FLAG_USENEWVALUE)
> 						{
> 							valuearrayfast_add_value_passin(&vaf_out,valuestodelete[i]);
> 							valuestodelete[i] = found;
> 						}

Actions: View | Diff

Attachments on bug 458675: 313970 | 314149 | 315149