[Fedora-directory-commits] dsgw dosearch.c,1.2,1.3

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Mon Jan 14 23:34:30 UTC 2008


Author: rmeggins

Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17549

Modified Files:
	dosearch.c 
Log Message:
Check ldapquery for NULL



Index: dosearch.c
===================================================================
RCS file: /cvs/dirsec/dsgw/dosearch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dosearch.c	14 Jan 2008 22:58:30 -0000	1.2
+++ dosearch.c	14 Jan 2008 23:34:27 -0000	1.3
@@ -82,12 +82,14 @@
 	    !strcmp(varname, "dn") || !strcmp(varname, "context")) {
 	    continue;
 	}
-	ldapquery = dsgw_ch_realloc(ldapquery, sizeof(char *) * (strlen(ldapquery) + strlen(varname) + 1));
-	PL_strcat(ldapquery, varname);
-	if (val && *val) {
-	    ldapquery = dsgw_ch_realloc(ldapquery, sizeof(char *) * (strlen(ldapquery) + strlen(val) + 2));
-	    PL_strcat(ldapquery, "=");
-	    PL_strcat(ldapquery, val);
+	if (ldapquery != NULL) {
+	    ldapquery = dsgw_ch_realloc(ldapquery, sizeof(char *) * (strlen(ldapquery) + strlen(varname) + 1));
+	    PL_strcat(ldapquery, varname);
+	    if (val && *val) {
+		ldapquery = dsgw_ch_realloc(ldapquery, sizeof(char *) * (strlen(ldapquery) + strlen(val) + 2));
+		PL_strcat(ldapquery, "=");
+		PL_strcat(ldapquery, val);
+	    }
 	}
     }
 
@@ -346,3 +348,11 @@
 
     ldap_unbind( ld );
 }
+
+/*
+  emacs settings
+  Local Variables:
+  indent-tabs-mode: t
+  tab-width: 8
+  End:
+*/




More information about the Fedora-directory-commits mailing list