summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Chapman <matty@samba.org>1999-04-11 01:39:16 +0000
committerMatthew Chapman <matty@samba.org>1999-04-11 01:39:16 +0000
commit1c7125629142bf00353bb6f15d7e996f06cb33d0 (patch)
treefe46b703000d07ad0bb6226fee822098cd6a3206
parent94928d4de7881cdf3655bcd4cb9b01608e7452aa (diff)
downloadsamba-1c7125629142bf00353bb6f15d7e996f06cb33d0.tar.gz
samba-1c7125629142bf00353bb6f15d7e996f06cb33d0.tar.bz2
samba-1c7125629142bf00353bb6f15d7e996f06cb33d0.zip
Incorrect length (number of unicode characters rather than buffer size)
passed to ascii_to_unibuf in make_buffer2 was breaking User Manager. (This used to be commit c518cef78d53a76451e5ea0ac93d75930306fa47)
-rw-r--r--source3/rpc_parse/parse_misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 51587e6d7a..a84469f8f9 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -530,7 +530,7 @@ void make_buffer2(BUFFER2 *str, const char *buf, int len)
str->undoc = 0;
/* store the string */
- ascii_to_unibuf(str->buffer, buf, len);
+ ascii_to_unibuf(str->buffer, buf, MIN(str->buf_len, sizeof(str->buffer)-1));
}
/*******************************************************************