Branch '389-ds-base-1.3.2' - lib/ldaputil

[Mark Reynolds]

lib/ldaputil/certmap.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7b464ad4e1bbdbebaa677b514de27ef56cd976d0
Author: Mark Reynolds 
Date:   Fri Mar 14 12:33:40 2014 -0400

Ticket 47740 - Crash caused by changes to certmap.c

Bug Description: dncomps & filtercomps could be incorrectly freed,
                     which lead to a crash.

Fix Description: Allocate "" for dncomps & filtercomps, instead of
                     setting it on the stack.

https://fedorahosted.org/389/ticket/47740

Reviewed by: rmeggins(Thanks!)
    (cherry picked from commit 33b98f1c901f1441dd1f709e244735fa339a287e)

diff --git a/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c
index aa5bafa..0935e4d 100644
--- a/lib/ldaputil/certmap.c
+++ b/lib/ldaputil/certmap.c
@@ -524,7 +524,7 @@ static int process_certinfo (LDAPUCertMapInfo_t *certinfo)
     }
     else if (rv == LDAPU_SUCCESS && !dncomps) {
         certinfo->dncompsState = COMPS_EMPTY;
-        dncomps = "";		/* present but empty */
+        dncomps = strdup("");		/* present but empty */
     }

rv = parse_into_bitmask (dncomps, &certinfo->dncomps, -1);
@@ -547,12 +547,12 @@ static int process_certinfo (LDAPUCertMapInfo_t *certinfo)
     }
     else if (rv == LDAPU_SUCCESS && !filtercomps) {
         certinfo->filtercompsState = COMPS_EMPTY;
-        filtercomps = "";	/* present but empty */
+        filtercomps = strdup("");	/* present but empty */
     }

rv = parse_into_bitmask (filtercomps, &certinfo->filtercomps, 0);

-    if (filtercomps) free(filtercomps);
+    free(filtercomps); filtercomps = NULL;

if (rv != LDAPU_SUCCESS) return rv;

@@ -590,7 +590,7 @@ static int process_certinfo (LDAPUCertMapInfo_t *certinfo)
     else if (rv == LDAPU_FAILED)  rv = LDAPU_SUCCESS;

if (verify) free(verify);
-    
+
     if (rv != LDAPU_SUCCESS) return rv;

{