summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-12-17 10:43:33 +0100
committerStefan Metzmacher <metze@samba.org>2014-12-18 10:46:12 +0100
commitf80a108f22eb87a0817529382a3f6bc46bfdeaa4 (patch)
treeaa9d4cec2e3b0a51e6289c50839d24332422597e /source3/locking
parent5d3a3c8b712dfa1b18aad02f963e025b7eefa46a (diff)
downloadsamba-f80a108f22eb87a0817529382a3f6bc46bfdeaa4.tar.gz
s3:locking: fix uninitialiazed variable in brl_get_locks_readonly_parser()
In a cluster this can be called with an empty record, while brl_parse_data() relies on an initialized structure. This is a regression in commit 837e29035c911f3509135252c3f423d0f56b606d. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10911 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 6bc41c459f6da7de62d2113590bc7d0c2d04e136)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/brlock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index b7dcb41c8d4..7d4d8383aa1 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -2005,6 +2005,7 @@ static void brl_get_locks_readonly_parser(TDB_DATA key, TDB_DATA data,
*state->br_lock = NULL;
return;
}
+ *br_lck = (struct byte_range_lock) {};
if (!brl_parse_data(br_lck, data)) {
*state->br_lock = NULL;
return;