Attachment 224951 Details for Bug 288291 – diffs

[patch] diffs

cvsdiffs (text/plain), 3.41 KB, created by Rich Megginson on 2007-10-12 03:53:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-12 03:53:56 UTC

Size: 3.41 KB

patch

obsolete

>Index: ldapserver/ldap/servers/plugins/views/views.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/views/views.c,v
>retrieving revision 1.9
>diff -u -8 -r1.9 views.c
>--- ldapserver/ldap/servers/plugins/views/views.c	10 Nov 2006 23:45:33 -0000	1.9
>+++ ldapserver/ldap/servers/plugins/views/views.c	12 Oct 2007 03:52:25 -0000
>@@ -759,16 +759,22 @@
> 		{
> 			current = current->pParent; 
> 			continue; /* skip this view */
> 		}
> 
> 		buf = slapi_ch_strdup(current->viewfilter);
> 
> 		pCurrentFilter = slapi_str2filter( buf );
>+		if (!pCurrentFilter) {
>+			char ebuf[BUFSIZ];
>+			slapi_log_error(SLAPI_LOG_FATAL, VIEWS_PLUGIN_SUBSYSTEM,
>+							"Error: the view filter [%s] in entry [%s] is not valid\n",
>+							buf, escape_string(current->pDn, ebuf));
>+		}
> 		if(pBuiltFilter && pCurrentFilter)
> 			pBuiltFilter = slapi_filter_join_ex( LDAP_FILTER_AND, pBuiltFilter, pCurrentFilter, 0 );
> 		else
> 			pBuiltFilter = pCurrentFilter;
> 
> 		slapi_ch_free((void **)&buf);
> 
> 		current = current->pParent; 
>@@ -930,17 +936,23 @@
> 			{
> 				buf=PR_smprintf("%s",currentChild->viewfilter);
> 			}
> 		}
> 
> 		if(buf)
> 		{
> 			pCurrentFilter = slapi_str2filter( buf );
>-			if(pOrSubFilter)
>+			if (!pCurrentFilter) {
>+				char ebuf[BUFSIZ];
>+				slapi_log_error(SLAPI_LOG_FATAL, VIEWS_PLUGIN_SUBSYSTEM,
>+								"Error: the view filter [%s] in entry [%s] is not valid\n",
>+								buf, escape_string(currentChild->pDn, ebuf));
>+			}
>+			if(pOrSubFilter && pCurrentFilter)
> 				pOrSubFilter = slapi_filter_join_ex( LDAP_FILTER_OR, pOrSubFilter, pCurrentFilter, 0 );
> 			else
> 				pOrSubFilter = pCurrentFilter;
> 
> 			PR_smprintf_free(buf);
> 		}
> 
> 
>@@ -989,18 +1001,24 @@
> 		viewRDN = slapi_rdn_new();
> 
> 		slapi_sdn_get_rdn(viewDN,viewRDN);
> 		viewRDNstr = (char *)slapi_rdn_get_rdn(viewRDN);
> 
> 		buf = slapi_ch_calloc(1, strlen(viewRDNstr) + 11 ); /* 3 for filter */
> 		sprintf(buf, "(%s)", viewRDNstr );
> 		viewSubFilter = slapi_str2filter( buf );
>-		
>-		if(pView->includeChildViewsFilter)
>+		if (!viewSubFilter) {
>+			char ebuf[BUFSIZ];
>+			slapi_log_error(SLAPI_LOG_FATAL, VIEWS_PLUGIN_SUBSYSTEM,
>+							"Error: the view filter [%s] in entry [%s] is not valid\n",
>+							buf, escape_string(current->pDn, ebuf));
>+		}
>+
>+		if(pView->includeChildViewsFilter && viewSubFilter)
> 			pView->includeChildViewsFilter = slapi_filter_join_ex( LDAP_FILTER_OR, pView->includeChildViewsFilter, viewSubFilter, 0 );
> 		else
> 			pView->includeChildViewsFilter = viewSubFilter;
> 
> 		slapi_ch_free((void **)&buf);
> 		slapi_sdn_free(&viewDN);
> 		slapi_rdn_free(&viewRDN);
> 
>Index: ldapserver/ldap/servers/slapd/plugin_internal_op.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/plugin_internal_op.c,v
>retrieving revision 1.7
>diff -u -8 -r1.7 plugin_internal_op.c
>--- ldapserver/ldap/servers/slapd/plugin_internal_op.c	10 Nov 2006 23:45:40 -0000	1.7
>+++ ldapserver/ldap/servers/slapd/plugin_internal_op.c	12 Oct 2007 03:52:25 -0000
>@@ -763,17 +763,17 @@
> done:
>     slapi_ch_free((void **) & fstr);
> 	if (filter != NULL) 
>     {
>         slapi_filter_free(filter, 1 /* recurse */);
>     }
> 
> 	if(original_base != new_base)
>-		slapi_ch_free((void**)new_base);
>+		slapi_ch_free_string(&new_base);
> 
> 	/* we strdup'd this above - need to free */
> 	slapi_pblock_get(pb, SLAPI_ORIGINAL_TARGET_DN, &original_base);
> 	slapi_ch_free_string(&original_base);
> 
>     return(rc);
> }
>

Actions: View | Diff

Attachments on bug 288291: 224951 | 225791 | 261051 | 261061 | 263091