diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-03-16 14:15:03 +0100 |
|---|---|---|
| committer | Martin Nagy <mnagy@redhat.com> | 2009-03-16 15:45:47 +0100 |
| commit | 07a229dfd6b276c552271b206c1b522edbb95d0c (patch) | |
| tree | af5323c437c8bb8235c710d4cf3b59b4f62757ef | |
| parent | f30621e5d86af629b279bba932571e8f055f1200 (diff) | |
| download | ldap_driver_testing-07a229dfd6b276c552271b206c1b522edbb95d0c.tar.gz ldap_driver_testing-07a229dfd6b276c552271b206c1b522edbb95d0c.tar.xz ldap_driver_testing-07a229dfd6b276c552271b206c1b522edbb95d0c.zip | |
Use isc_mem_allocate when we call isc_mem_free.
| -rw-r--r-- | ldap_helper.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/ldap_helper.c b/ldap_helper.c index f21b0fe..5e57199 100644 --- a/ldap_helper.c +++ b/ldap_helper.c @@ -1516,7 +1516,12 @@ ldap_rdata_to_char_array(isc_mem_t *mctx, dns_rdata_t *rdata_head, rdata_count++; vals_size = (rdata_count + 1) * sizeof(char *); - CHECKED_MEM_GET(mctx, vals, vals_size); + /* Use isc_mem_allocate because we call isc_mem_free */ + vals = isc_mem_allocate(mctx, vals_size); + if (vals == NULL) { + result = ISC_R_NOMEMORY; + goto cleanup; + } memset(vals, 0, vals_size); rdata = rdata_head; @@ -1530,8 +1535,16 @@ ldap_rdata_to_char_array(isc_mem_t *mctx, dns_rdata_t *rdata_head, CHECK(dns_rdata_totext(rdata, NULL, &buffer)); isc_buffer_usedregion(&buffer, ®ion); - /* Now allocate the string with the right size. */ - CHECKED_MEM_GET(mctx, vals[i], region.length + 1); + /* + * Now allocate the string with the right size. Use + * isc_mem_allocate instead of isc_mem_get ! + */ + vals[i] = isc_mem_allocate(mctx, region.length + 1); + if (vals[i] == NULL) { + result = ISC_R_NOMEMORY; + goto cleanup; + } + memcpy(vals[i], region.base, region.length); vals[i][region.length] = '\0'; |