Commit 81e9e868 authored by Howard Chu's avatar Howard Chu
Browse files

Fix ldap_str2rdn, make sure to update progress pointer; don't

free attrType since we never allocate it
parent 670c66bd
...@@ -1178,12 +1178,10 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags ) ...@@ -1178,12 +1178,10 @@ ldap_str2rdn( const char *str, LDAPRDN **rdn, const char **n, unsigned flags )
goto parsing_error; goto parsing_error;
} }
} }
*n = p;
parsing_error:; parsing_error:;
/* They are set to NULL after they're used in an AVA */ /* They are set to NULL after they're used in an AVA */
if ( attrType.bv_val ) {
free( attrType.bv_val );
}
if ( attrValue.bv_val ) { if ( attrValue.bv_val ) {
free( attrValue.bv_val ); free( attrValue.bv_val );
...@@ -1195,7 +1193,7 @@ parsing_error:; ...@@ -1195,7 +1193,7 @@ parsing_error:;
return_result:; return_result:;
Debug( LDAP_DEBUG_TRACE, "<= ldap_str2rdn(%*s)=%d\n", Debug( LDAP_DEBUG_TRACE, "<= ldap_str2rdn(%*s)=%d\n",
*n - p, str, rc ); p - str, str, rc );
if ( rdn ) { if ( rdn ) {
*rdn = newRDN; *rdn = newRDN;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment