Attachment 13290 Details for Bug 12795 – Latest patch fixing res->msgs[0] reference

[patch] Latest patch fixing res->msgs[0] reference

git-am-fix-for-master-002.patch (text/plain), 1.69 KB, created by Francis Brosnan Blázquez on 2017-06-19 14:48:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francis Brosnan Blázquez

Created: 2017-06-19 14:48:18 UTC

Size: 1.69 KB

patch

obsolete

>--- source4/rpc_server/dnsserver/dcerpc_dnsserver.c	2017-06-19 16:39:36.512000000 +0200
>+++ source4/rpc_server/dnsserver/dcerpc_dnsserver.c.orig	2017-06-19 16:38:01.300000000 +0200
>@@ -1723,16 +1723,14 @@
> 	TALLOC_CTX *tmp_ctx;
> 	char *name;
> 	const char * const attrs[] = { "name", "dnsRecord", NULL };
>-	struct ldb_result *res = NULL;
>-	struct DNS_RPC_RECORDS_ARRAY *recs = NULL;
>+	struct ldb_result *res;
>+	struct DNS_RPC_RECORDS_ARRAY *recs;
> 	char **add_names = NULL;
>-	char *rname = NULL;
>+	char *rname;
> 	int add_count = 0;
> 	int i, ret, len;
> 	WERROR status;
>-	struct dns_tree *tree = NULL;
>-	struct dns_tree *base = NULL;
>-	struct dns_tree *node = NULL;
>+	struct dns_tree *tree, *base, *node;
> 
> 	tmp_ctx = talloc_new(mem_ctx);
> 	W_ERROR_HAVE_NO_MEMORY(tmp_ctx);
>@@ -1809,9 +1807,9 @@
> 		}
> 	}
> 
>-	TALLOC_FREE(res);
>-	TALLOC_FREE(tree);
>-	TALLOC_FREE(name);
>+	talloc_free(res);
>+	talloc_free(tree);
>+	talloc_free(name);
> 
> 	/* Add any additional records */
> 	if (select_flag & DNS_RPC_VIEW_ADDITIONAL_DATA) {
>@@ -1825,14 +1823,14 @@
> 						LDB_SCOPE_ONELEVEL, attrs,
> 						"(&(objectClass=dnsNode)(name=%s)(!(dNSTombstoned=TRUE)))",
> 						name);
>-				TALLOC_FREE(name);
>+				talloc_free(name);
> 				if (ret != LDB_SUCCESS) {
> 					continue;
> 				}
> 				if (res->count == 1) {
> 					break;
> 				} else {
>-					TALLOC_FREE(res);
>+					talloc_free(res);
> 					continue;
> 				}
> 			}
>@@ -1845,10 +1843,10 @@
> 			}
> 			status = dns_fill_records_array(tmp_ctx, NULL, DNS_TYPE_A,
> 							select_flag, rname,
>-							(res && res->count > 0) ? res->msgs[0] : NULL, 0, recs,
>+							res->msgs[0], 0, recs,
> 							NULL, NULL);
>-			TALLOC_FREE(rname);
>-			TALLOC_FREE(res);
>+			talloc_free(rname);
>+			talloc_free(res);
> 		}
> 	}
>

Actions: View

Attachments on bug 12795: 13228 | 13229 | 13290 | 13291 | 16179 | 16180