Attachment 15328 Details for Bug 14049 – a patch that stops the crash (v2)

[patch] a patch that stops the crash (v2)

0001-ldb-don-t-try-to-save-a-value-that-isn-t-there.patch (text/plain), 1.93 KB, created by Douglas Bagnall on 2019-07-25 22:06:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2019-07-25 22:06:15 UTC

Size: 1.93 KB

patch

obsolete

>From dcf5693ffbe3a15434cf223b39259eac94e67972 Mon Sep 17 00:00:00 2001
>From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Date: Fri, 26 Jul 2019 09:49:13 +1200
>Subject: [PATCH] ldb: don't try to save a value that isn't there
>
>Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>---
> lib/ldb/common/ldb_dn.c | 47 +++++++++++++++++++++--------------------
> 1 file changed, 24 insertions(+), 23 deletions(-)
>
>diff --git a/lib/ldb/common/ldb_dn.c b/lib/ldb/common/ldb_dn.c
>index eccb4a0ce4b..ce22b64da69 100644
>--- a/lib/ldb/common/ldb_dn.c
>+++ b/lib/ldb/common/ldb_dn.c
>@@ -692,31 +692,32 @@ static bool ldb_dn_explode(struct ldb_dn *dn)
> 		goto failed;
> 	}
> 
>-	/* save last element */
>-	if ( t ) {
>-		/* trim back */
>-		d -= (p - t);
>-		l -= (p - t);
>-	}
>+	if (in_value) {
>+		/* save last element */
>+		if ( t ) {
>+			/* trim back */
>+			d -= (p - t);
>+			l -= (p - t);
>+		}
>+
>+		*d++ = '\0';
>+		/*
>+		 * This talloc_memdup() is OK with the
>+		 * +1 because *d has been set to '\0'
>+		 * just above.
>+		 */
>+		dn->components[dn->comp_num].value.length = l;
>+		dn->components[dn->comp_num].value.data =
>+			(uint8_t *)talloc_memdup(dn->components, dt, l + 1);
>+		if ( ! dn->components[dn->comp_num].value.data) {
>+			/* ouch */
>+			goto failed;
>+		}
>+		talloc_set_name_const(dn->components[dn->comp_num].value.data,
>+			(const char *)dn->components[dn->comp_num].value.data);
> 
>-	*d++ = '\0';
>-	/*
>-	 * This talloc_memdup() is OK with the
>-	 * +1 because *d has been set to '\0'
>-	 * just above.
>-	 */
>-	dn->components[dn->comp_num].value.length = l;
>-	dn->components[dn->comp_num].value.data =
>-		(uint8_t *)talloc_memdup(dn->components, dt, l + 1);
>-	if ( ! dn->components[dn->comp_num].value.data) {
>-		/* ouch */
>-		goto failed;
>+		dn->comp_num++;
> 	}
>-	talloc_set_name_const(dn->components[dn->comp_num].value.data,
>-			      (const char *)dn->components[dn->comp_num].value.data);
>-
>-	dn->comp_num++;
>-
> 	talloc_free(data);
> 	return true;
> 
>-- 
>2.20.1
>

Actions: View

Attachments on bug 14049: 15323 | 15327 | 15328 | 15330 | 15378 | 15403