From: Bhaskar Jain (bhajain) <bhajain@cisco.com>
Date: Fri, 20 Mar 2009 07:11:30 +0000 (+0100)
Subject: prevent segmentation fault on joining a very long domain name in samba-3.0.32
X-Git-Tag: samba-3.0.36~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=746dde02c829adb56ca639f5a6e4d44be9468018;p=thirdparty%2Fsamba.git

prevent segmentation fault on joining a very long domain name in samba-3.0.32

For a detailed explanation, see
http://lists.samba.org/archive/samba-technical/2009-March/063626.html
(cherry picked from commit a92280537071b5a9a9bc56fbeead14c6874d5a55)
---

diff --git a/source/libads/cldap.c b/source/libads/cldap.c
index 3cb98c59c58..e01b00bdd80 100644
--- a/source/libads/cldap.c
+++ b/source/libads/cldap.c
@@ -60,7 +60,7 @@ static unsigned pull_netlogon_string(char *ret, const char *ptr,
 				ret_len += 2;
 				followed_ptr = 1;
 			}
-			len = ((ptr[0] & 0x3f) << 8) | ptr[1];
+			len = ((ptr[0] & 0x3f) << 8) | (uint8) ptr[1];
 			ptr = data + len;
 		} else if (*ptr) {
 			uint8 len = (uint8)*(ptr++);