CVE-2016-0771: librpc: add ndr_dnsp_string_list_copy() helper function

[samba.git] / librpc / ndr / ndr_dnsp.c

diff --git a/librpc/ndr/ndr_dnsp.c b/librpc/ndr/ndr_dnsp.c
index f341c829223d750d309dafce92de1a986ab1ef20..82b5fb5d55ee9fde213168440818976e74327015 100644 (file)
--- a/librpc/ndr/ndr_dnsp.c
+++ b/librpc/ndr/ndr_dnsp.c
@@ -170,3 +170,82 @@ enum ndr_err_code ndr_push_dnsp_string(struct ndr_push *ndr, int ndr_flags, cons
 
        return NDR_ERR_SUCCESS;
 }
+
+/*
+ * print a dnsp_string_list
+ */
+_PUBLIC_ void ndr_print_dnsp_string_list(struct ndr_print *ndr, const char *name,
+                                        const struct dnsp_string_list *list)
+{
+       uint32_t i;
+
+       ndr->no_newline = true;
+       for (i=0; i<ndr->depth; i++) {
+               ndr->print(ndr, "    ");
+       }
+       ndr->print(ndr, "%-25s:", name);
+       for (i=0; i<list->count; i++) {
+               ndr->print(ndr, " \"%s\"", list->str[i]);
+       }
+       ndr->print(ndr, "\n");
+       ndr->no_newline = false;
+}
+
+/*
+ * pull a dnsp_string_list
+ */
+_PUBLIC_ enum ndr_err_code ndr_pull_dnsp_string_list(struct ndr_pull *ndr, int ndr_flags, struct dnsp_string_list *list)
+{
+       list->count = 0;
+       list->str = talloc_array(ndr->current_mem_ctx, const char *,
+                                list->count);
+       if (! list->str) {
+               return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Failed to pull dnsp_string_list");
+       }
+
+       while (ndr->offset < ndr->data_size) {
+               list->str = talloc_realloc(ndr->current_mem_ctx, list->str,
+                                          const char *, list->count+1);
+               if (! list->str) {
+                       return ndr_pull_error(ndr, NDR_ERR_ALLOC, "Failed to pull dnsp_string_list");
+               }
+               NDR_CHECK(ndr_pull_dnsp_string(ndr, ndr_flags, &list->str[list->count]));
+               list->count++;
+       }
+
+       return NDR_ERR_SUCCESS;
+}
+
+enum ndr_err_code ndr_push_dnsp_string_list(struct ndr_push *ndr, int ndr_flags, const struct dnsp_string_list *list)
+{
+       uint8_t i;
+
+       for (i=0; i<list->count; i++) {
+               NDR_CHECK(ndr_push_dnsp_string(ndr, ndr_flags, list->str[i]));
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+enum ndr_err_code ndr_dnsp_string_list_copy(TALLOC_CTX *mem_ctx,
+                                           const struct dnsp_string_list *src,
+                                           struct dnsp_string_list *dst)
+{
+       size_t i;
+
+       dst->count = 0;
+       dst->str = talloc_zero_array(mem_ctx, const char *, src->count);
+       if (dst->str == NULL) {
+               return NDR_ERR_ALLOC;
+       }
+
+       for (i = 0; i < src->count; i++) {
+               dst->str[i] = talloc_strdup(dst->str, src->str[i]);
+               if (dst->str[i] == NULL) {
+                       TALLOC_FREE(dst->str);
+                       return NDR_ERR_ALLOC;
+               }
+       }
+
+       dst->count = src->count;
+       return NDR_ERR_SUCCESS;
+}