Plug mutex/rwlock leaks (destroy them)

[openldap] / servers / slapd / ldapsync.c

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 99905ac67718307073724ce3ad902d686fc1ad65..69efb953f838ba99c0626cd8d3ecab83b1f73147 100644 (file)
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2007 The OpenLDAP Foundation.
+ * Copyright 2003-2010 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -45,7 +45,7 @@ slap_compose_sync_cookie(
        }
 
        if ( numcsn == 0 || rid == -1 ) {
-               char cookiestr[ LDAP_LUTIL_CSNSTR_BUFSIZE + 20 ];
+               char cookiestr[ LDAP_PVT_CSNSTR_BUFSIZE + 20 ];
                if ( rid == -1 ) {
                        cookiestr[0] = '\0';
                        len = 0;
@@ -146,8 +146,8 @@ slap_parse_csn_sid( struct berval *csnp )
 
        csn.bv_len = q - p;
 
-       i = (int)strtoul( p, &q, 16 );
-       if ( p == q || q != p + csn.bv_len || i > SLAP_SYNC_SID_MAX ) {
+       i = strtol( p, &q, 16 );
+       if ( p == q || q != p + csn.bv_len || i < 0 || i > SLAP_SYNC_SID_MAX ) {
                i = -1;
        }
 
@@ -174,10 +174,9 @@ slap_parse_sync_cookie(
 {
        char *csn_ptr;
        char *csn_str;
-       char *rid_ptr;
        char *cval;
        char *next, *end;
-       AttributeDescription *ad = slap_schema.si_ad_modifyTimestamp;
+       AttributeDescription *ad = slap_schema.si_ad_entryCSN;
 
        if ( cookie == NULL )
                return -1;
@@ -195,11 +194,13 @@ slap_parse_sync_cookie(
 
        for ( next=cookie->octet_str.bv_val; next < end; ) {
                if ( !strncmp( next, "rid=", STRLENOF("rid=") )) {
-                       rid_ptr = next;
-                       cookie->rid = strtoul( &rid_ptr[ STRLENOF( "rid=" ) ], &next, 10 );
+                       char *rid_ptr = next;
+                       cookie->rid = strtol( &rid_ptr[ STRLENOF( "rid=" ) ], &next, 10 );
                        if ( next == rid_ptr ||
                                next > end ||
-                               ( *next && *next != ',' ) )
+                               ( *next && *next != ',' ) ||
+                               cookie->rid < 0 ||
+                               cookie->rid > SLAP_SYNC_RID_MAX )
                        {
                                return -1;
                        }
@@ -212,11 +213,14 @@ slap_parse_sync_cookie(
                        continue;
                }
                if ( !strncmp( next, "sid=", STRLENOF("sid=") )) {
-                       rid_ptr = next;
-                       cookie->sid = strtoul( &rid_ptr[ STRLENOF( "sid=" ) ], &next, 16 );
-                       if ( next == rid_ptr ||
+                       char *sid_ptr = next;
+                       sid_ptr = next;
+                       cookie->sid = strtol( &sid_ptr[ STRLENOF( "sid=" ) ], &next, 16 );
+                       if ( next == sid_ptr ||
                                next > end ||
-                               ( *next && *next != ',' ) )
+                               ( *next && *next != ',' ) ||
+                               cookie->sid < 0 ||
+                               cookie->sid > SLAP_SYNC_SID_MAX )
                        {
                                return -1;
                        }
@@ -226,13 +230,11 @@ slap_parse_sync_cookie(
                        continue;
                }
                if ( !strncmp( next, "csn=", STRLENOF("csn=") )) {
-                       slap_syntax_validate_func *validate;
                        struct berval stamp;
 
                        next += STRLENOF("csn=");
                        while ( next < end ) {
                                csn_str = next;
-                               /* FIXME use csnValidate when it gets implemented */
                                csn_ptr = strchr( csn_str, '#' );
                                if ( !csn_ptr || csn_ptr > end )
                                        break;
@@ -240,14 +242,6 @@ slap_parse_sync_cookie(
                                 * want to parse the rid then. But we still iterate
                                 * through the string to find the end.
                                 */
-                               if ( ad ) {
-                                       stamp.bv_val = csn_str;
-                                       stamp.bv_len = csn_ptr - csn_str;
-                                       validate = ad->ad_type->sat_syntax->ssyn_validate;
-                                       if ( validate( ad->ad_type->sat_syntax, &stamp )
-                                               != LDAP_SUCCESS )
-                                               break;
-                               }
                                cval = strchr( csn_ptr, ';' );
                                if ( !cval )
                                        cval = strchr(csn_ptr, ',' );
@@ -257,7 +251,16 @@ slap_parse_sync_cookie(
                                        stamp.bv_len = end - csn_str;
                                if ( ad ) {
                                        struct berval bv;
-                                       ber_dupbv_x( &bv, &stamp, memctx );
+                                       stamp.bv_val = csn_str;
+                                       if ( ad->ad_type->sat_syntax->ssyn_validate(
+                                               ad->ad_type->sat_syntax, &stamp ) != LDAP_SUCCESS )
+                                               break;
+                                       if ( ad->ad_type->sat_equality->smr_normalize(
+                                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+                                               ad->ad_type->sat_syntax,
+                                               ad->ad_type->sat_equality,
+                                               &stamp, &bv, memctx ) != LDAP_SUCCESS )
+                                               break;
                                        ber_bvarray_add_x( &cookie->ctxcsn, &bv, memctx );
                                        cookie->numcsns++;
                                }
@@ -286,14 +289,14 @@ slap_init_sync_cookie_ctxcsn(
        struct sync_cookie *cookie
 )
 {
-       char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE + 4 ];
+       char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE + 4 ];
        struct berval octet_str = BER_BVNULL;
        struct berval ctxcsn = BER_BVNULL;
 
        if ( cookie == NULL )
                return -1;
 
-       octet_str.bv_len = snprintf( csnbuf, LDAP_LUTIL_CSNSTR_BUFSIZE + 4,
+       octet_str.bv_len = snprintf( csnbuf, LDAP_PVT_CSNSTR_BUFSIZE + 4,
                                        "csn=%4d%02d%02d%02d%02d%02dZ#%06x#%02x#%06x",
                                        1900, 1, 1, 0, 0, 0, 0, 0, 0 );
        octet_str.bv_val = csnbuf;