Attachment 9521 Details for Bug 10305 – git-am fix for 4.1.next, 4.0.next.

[patch] git-am fix for 4.1.next, 4.0.next.

0001-ldb-bad-if-test-in-ldb_comparison_fold.patch (text/plain), 1.06 KB, created by Jeremy Allison on 2013-12-11 01:17:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-12-11 01:17:18 UTC

Size: 1.06 KB

patch

obsolete

>From a91ae3e575ae50b60190329d011dd44e758470da Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 6 Dec 2013 15:58:02 -0800
>Subject: [PATCH] ldb: bad if test in ldb_comparison_fold()
>
>Found by David Binderman <dcb314@hotmail.com>
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10305
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Michael Adam <obnox@samba.org>
>Autobuild-Date(master): Sat Dec  7 11:10:47 CET 2013 on sn-devel-104
>---
> lib/ldb/common/attrib_handlers.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/ldb/common/attrib_handlers.c b/lib/ldb/common/attrib_handlers.c
>index daeb422..4b94d39 100644
>--- a/lib/ldb/common/attrib_handlers.c
>+++ b/lib/ldb/common/attrib_handlers.c
>@@ -254,7 +254,7 @@ int ldb_comparison_fold(struct ldb_context *ldb, void *mem_ctx,
> 	if (n2 == 0 && n1 != 0) {
> 		return (int)toupper(*s1);
> 	}
>-	if (n2 == 0 && n2 == 0) {
>+	if (n1 == 0 && n2 == 0) {
> 		return 0;
> 	}
> 	return (int)toupper(*s1) - (int)toupper(*s2);
>-- 
>1.8.5.1
>

Flags:

ddiss: review+
vl: review+

Actions: View

Attachments on bug 10305: 9521