Changeset 739 for branches/samba-3.5.x/source3/libaddns/dnsmarshall.c

Timestamp:

Nov 12, 2012, 7:37:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.19

File:

• branches/samba-3.5.x/source3/libaddns/dnsmarshall.c (modified) (9 diffs)

branches/samba-3.5.x/source3/libaddns/dnsmarshall.c

@@ -28 +28 @@
         struct dns_buffer *result;
 
-        if (!(result = talloc(mem_ctx, struct dns_buffer))) {
+        if (!(result = talloc_zero(mem_ctx, struct dns_buffer))) {
                 return NULL;
         }
@@ -40 +40 @@
         result->size = 2;
 
-        if (!(result->data = TALLOC_ARRAY(result, uint8, result->size))) {
+        if (!(result->data = TALLOC_ZERO_ARRAY(result, uint8, result->size))) {
                 TALLOC_FREE(result);
                 return NULL;
@@ -217 +217 @@
         }
 
-        if (!(label = talloc(mem_ctx, struct dns_domain_label))) {
+        if (!(label = talloc_zero(mem_ctx, struct dns_domain_label))) {
                 buf->error = ERROR_DNS_NO_MEMORY;
                 return;
@@ -224 +224 @@
         label->len = len;
 
-        if (!(label->label = TALLOC_ARRAY(label, char, len+1))) {
+        if (!(label->label = TALLOC_ZERO_ARRAY(label, char, len+1))) {
                 buf->error = ERROR_DNS_NO_MEMORY;
                 goto error;
@@ -251 +251 @@
         if (!ERR_DNS_IS_OK(buf->error)) return;
 
-        if (!(name = talloc(mem_ctx, struct dns_domain_name))) {
+        if (!(name = talloc_zero(mem_ctx, struct dns_domain_name))) {
                 buf->error = ERROR_DNS_NO_MEMORY;
                 return;
@@ -282 +282 @@
         if (!(ERR_DNS_IS_OK(buf->error))) return;
 
-        if (!(q = talloc(mem_ctx, struct dns_question))) {
+        if (!(q = talloc_zero(mem_ctx, struct dns_question))) {
                 buf->error = ERROR_DNS_NO_MEMORY;
                 return;
@@ -315 +315 @@
         if (!(ERR_DNS_IS_OK(buf->error))) return;
 
-        if (!(r = talloc(mem_ctx, struct dns_rrec))) {
+        if (!(r = talloc_zero(mem_ctx, struct dns_rrec))) {
                 buf->error = ERROR_DNS_NO_MEMORY;
                 return;
@@ -330 +330 @@
 
         if (r->data_length != 0) {
-                if (!(r->data = TALLOC_ARRAY(r, uint8, r->data_length))) {
+                if (!(r->data = TALLOC_ZERO_ARRAY(r, uint8, r->data_length))) {
                         buf->error = ERROR_DNS_NO_MEMORY;
                         return;
@@ -407 +407 @@
 
         if ((req->num_questions != 0) &&
-            !(req->questions = TALLOC_ARRAY(req, struct dns_question *,
+            !(req->questions = TALLOC_ZERO_ARRAY(req, struct dns_question *,
                                             req->num_questions))) {
                 goto error;
         }
         if ((req->num_answers != 0) &&
-            !(req->answers = TALLOC_ARRAY(req, struct dns_rrec *,
+            !(req->answers = TALLOC_ZERO_ARRAY(req, struct dns_rrec *,
                                           req->num_answers))) {
                 goto error;
         }
         if ((req->num_auths != 0) &&
-            !(req->auths = TALLOC_ARRAY(req, struct dns_rrec *,
+            !(req->auths = TALLOC_ZERO_ARRAY(req, struct dns_rrec *,
                                         req->num_auths))) {
                 goto error;
         }
         if ((req->num_additionals != 0) &&
-            !(req->additionals = TALLOC_ARRAY(req, struct dns_rrec *,
+            !(req->additionals = TALLOC_ZERO_ARRAY(req, struct dns_rrec *,
                                               req->num_additionals))) {
                 goto error;