summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBhaskar Jain (bhajain) <bhajain@cisco.com>2009-03-20 08:11:30 +0100
committerKarolin Seeger <kseeger@samba.org>2009-07-30 09:22:13 +0200
commit746dde02c829adb56ca639f5a6e4d44be9468018 (patch)
treefb13a1ac87668919b4f07cd38a43575835322e95
parent568ef20412f4e2bf0872da5beb08fcbe1aa3fc5e (diff)
downloadsamba-746dde02c829adb56ca639f5a6e4d44be9468018.tar.gz
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)
-rw-r--r--source/libads/cldap.c2
1 files changed, 1 insertions, 1 deletions
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++);