summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSASAJIMA Toshihiro <sasajima_t@jp.fujitsu.com>2010-01-12 21:43:23 -0800
committerJeremy Allison <jra@samba.org>2010-01-12 21:43:23 -0800
commitca847952054f5bbde1d40ad4260589b6fcc9721d (patch)
tree2b79286e3a6f7af9e26466393a0b26075a238be8
parented457e07b9bdc0acda9dc52307d8bc2118f32f06 (diff)
downloadsamba-ca847952054f5bbde1d40ad4260589b6fcc9721d.tar.gz
samba-ca847952054f5bbde1d40ad4260589b6fcc9721d.tar.bz2
samba-ca847952054f5bbde1d40ad4260589b6fcc9721d.zip
Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV)
-rw-r--r--source3/modules/vfs_cap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 7edbb8783c..35fa740dd0 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -695,12 +695,13 @@ static char *capdecode(TALLOC_CTX *ctx, const char *from)
size_t len = 0;
for (p1 = from; *p1; len++) {
- if (is_hex(from)) {
+ if (is_hex(p1)) {
p1 += 3;
} else {
p1++;
}
}
+ len++;
to = TALLOC_ARRAY(ctx, char, len);
if (!to) {