generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ldap: Fixed attribute memory leaks on failed client write

Browse Source 
Fixed memory leaks from commit 086ad79970 as was noted in the commit
comments.
This commit is contained in:
Steve Holme 2015-01-03 17:25:11 +00:00
parent a68aa81320
commit 4967109ffc
1 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/ldap.c
View File

@ -413,6 +413,7 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
ldap_memfree(dn); ldap_memfree(dn);
} }
/* Get the attributes and write them to the client */
for(attribute = ldap_first_attribute(server, entryIterator, &ber); for(attribute = ldap_first_attribute(server, entryIterator, &ber);
attribute; attribute;
attribute = ldap_next_attribute(server, entryIterator, ber)) { attribute = ldap_next_attribute(server, entryIterator, ber)) {
@ -421,17 +422,36 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
if(vals != NULL) { if(vals != NULL) {
for(i = 0; (vals[i] != NULL); i++) { for(i = 0; (vals[i] != NULL); i++) {
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\t", 1); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\t", 1);
if(result) if(result) {
ldap_value_free_len(vals);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit; goto quit;
}
result = Curl_client_write(conn, CLIENTWRITE_BODY, result = Curl_client_write(conn, CLIENTWRITE_BODY,
(char *)attribute, 0); (char *)attribute, 0);
if(result) if(result) {
ldap_value_free_len(vals);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit; goto quit;
}
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)": ", 2); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)": ", 2);
if(result) if(result) {
ldap_value_free_len(vals);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit; goto quit;
}
dlsize += strlen(attribute)+3; dlsize += strlen(attribute)+3;
if((strlen(attribute) > 7) && if((strlen(attribute) > 7) &&
@ -452,37 +472,63 @@ static CURLcode Curl_ldap(struct connectdata *conn, bool *done)
result = error; result = error;
goto quit; goto quit;
} }
if(val_b64_sz > 0) { if(val_b64_sz > 0) {
result = Curl_client_write(conn, CLIENTWRITE_BODY, val_b64, result = Curl_client_write(conn, CLIENTWRITE_BODY, val_b64,
val_b64_sz); val_b64_sz);
free(val_b64); free(val_b64);
if(result) if(result) {
ldap_value_free_len(vals);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit; goto quit;
}
dlsize += val_b64_sz; dlsize += val_b64_sz;
} }
} }
else { else {
result = Curl_client_write(conn, CLIENTWRITE_BODY, vals[i]->bv_val, result = Curl_client_write(conn, CLIENTWRITE_BODY, vals[i]->bv_val,
vals[i]->bv_len); vals[i]->bv_len);
if(result) if(result) {
ldap_value_free_len(vals);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit; goto quit;
}
dlsize += vals[i]->bv_len; dlsize += vals[i]->bv_len;
} }
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 0); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 0);
if(result) if(result) {
ldap_value_free_len(vals);
ldap_memfree(attribute);
if(ber)
ber_free(ber, 0);
goto quit; goto quit;
}
dlsize++; dlsize++;
} }
/* Free memory used to store values */ /* Free memory used to store values */
ldap_value_free_len(vals); ldap_value_free_len(vals);
} }
/* Free the attribute as we are done with it */
ldap_memfree(attribute);
result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1); result = Curl_client_write(conn, CLIENTWRITE_BODY, (char *)"\n", 1);
if(result) if(result)
goto quit; goto quit;
dlsize++; dlsize++;
Curl_pgrsSetDownloadCounter(data, dlsize); Curl_pgrsSetDownloadCounter(data, dlsize);
ldap_memfree(attribute);
} }
if(ber) if(ber)