diff options
| author | Yang Tse <yangsita@gmail.com> | 2011-08-24 08:07:36 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-08-24 08:10:30 +0200 |
| commit | fd00b382b2d33ef90c6f5c840a32b66c8ceb1662 (patch) | |
| tree | e95c73f96e5b4e67059326823e68ce78fc6f300b /lib/openldap.c | |
| parent | cce6508242ab73cca896788ad9f968b89e5f9f3a (diff) | |
base64: fix Curl_base64_encode and Curl_base64_decode interfaces
Previous interfaces for these libcurl internal functions did not allow to tell
apart a legitimate zero size result from an error condition. These functions
now return a CURLcode indicating function success or otherwise specific error.
Output size is returned using a pointer argument.
All usage of these two functions, and others closely related, has been adapted
to the new interfaces. Relative error and OOM handling adapted or added where
missing. Unit test 1302 also adapted.
Diffstat (limited to 'lib/openldap.c')
| -rw-r--r-- | lib/openldap.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lib/openldap.c b/lib/openldap.c index 69523cb37..070892524 100644 --- a/lib/openldap.c +++ b/lib/openldap.c @@ -544,12 +544,21 @@ static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf, } } if(binary || binval) { - char *val_b64; + char *val_b64 = NULL; + size_t val_b64_sz = 0; /* Binary value, encode to base64. */ - size_t val_b64_sz = Curl_base64_encode(data, - bvals[i].bv_val, - bvals[i].bv_len, - &val_b64); + CURLcode error = Curl_base64_encode(data, + bvals[i].bv_val, + bvals[i].bv_len, + &val_b64, + &val_b64_sz); + if(error) { + ber_memfree(bvals); + ber_free(ber, 0); + ldap_msgfree(result); + *err = error; + return -1; + } Curl_client_write(conn, CLIENTWRITE_BODY, (char *)": ", 2); data->req.bytecount += 2; if(val_b64_sz > 0) { |