[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  5ccfd38 dnsserver: Stop dns_name_equal doing OOB read
      from  c47e6b1 ctdb-common: Fix crash in logging initialisation

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5ccfd38156ddf2435df15600638cde8ed020958f
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Thu Jun 1 14:36:07 2017 +1200

    dnsserver: Stop dns_name_equal doing OOB read
    
    This has been the cause of a large number of flakey autobuilds. Every
    now and again dns_name_equal would not be equal between two empty
    strings, thus causing failures.
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12813
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Jun  1 19:34:38 CEST 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source4/rpc_server/dnsserver/dnsdata.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 9b3c9f9..c300643 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -1127,8 +1127,8 @@ bool dns_name_equal(const char *name1, const char *name2)
 	size_t len1 = strlen(name1);
 	size_t len2 = strlen(name2);
 
-	if (name1[len1-1] == '.') len1--;
-	if (name2[len2-1] == '.') len2--;
+	if (len1 > 0 && name1[len1-1] == '.') len1--;
+	if (len2 > 0 && name2[len2-1] == '.') len2--;
 	if (len1 != len2) {
 		return false;
 	}


-- 
Samba Shared Repository