diff options
| author | Volker Lendecke <vl@samba.org> | 2007-04-17 09:36:53 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2007-04-17 09:36:53 +0200 |
| commit | 748cc9e4b76999d4fb20b60f8e806c632e15ce78 (patch) | |
| tree | 1be567e4fb92d694e540dc9509c2637afb57f741 | |
| parent | 6fce6e419a4e65ab1e23ad4001b71cdbfa5edf29 (diff) | |
| download | samba-748cc9e4b76999d4fb20b60f8e806c632e15ce78.tar.gz samba-748cc9e4b76999d4fb20b60f8e806c632e15ce78.tar.xz samba-748cc9e4b76999d4fb20b60f8e806c632e15ce78.zip | |
ZERO_STRUCT writes one byte too many here.
(This used to be ctdb commit 3c5c433e5b92f8fe2193a6e5720e31e3eb6bc76b)
| -rw-r--r-- | ctdb/common/ctdb_daemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c index aa1f12474a..320a9e9b19 100644 --- a/ctdb/common/ctdb_daemon.c +++ b/ctdb/common/ctdb_daemon.c @@ -89,7 +89,7 @@ static void daemon_message_handler(struct ctdb_context *ctdb, uint32_t srvid, /*XXX cant use this since it returns an int CTDB_NO_MEMORY(ctdb, r);*/ talloc_set_name_const(r, "req_message packet"); - ZERO_STRUCT(*r); + memset(r, 0, offsetof(struct ctdb_req_message, data)); r->hdr.length = len; r->hdr.ctdb_magic = CTDB_MAGIC; @@ -171,7 +171,7 @@ static void daemon_fetch_lock_complete(struct ctdb_call_state *state) printf("Failed to allocate reply_call in ctdb daemon\n"); return; } - ZERO_STRUCT(*r); + memset(r, 0, offsetof(struct ctdb_reply_fetch_lock, data)); r->hdr.length = length; r->hdr.ctdb_magic = CTDB_MAGIC; r->hdr.ctdb_version = CTDB_VERSION; @@ -347,7 +347,7 @@ static void daemon_request_call_from_client(struct ctdb_client *client, printf("Failed to allocate reply_call in ctdb daemon\n"); return; } - ZERO_STRUCT(*r); + memset(r, 0, offsetof(struct ctdb_reply_call, data)); r->hdr.length = length; r->hdr.ctdb_magic = CTDB_MAGIC; r->hdr.ctdb_version = CTDB_VERSION; |