summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-03-04 09:43:19 +0100
committerDavid Disseldorp <ddiss@samba.org>2015-03-04 14:46:07 +0100
commit6fdbf8de87521ea6f08cda6edf7129bdb6987968 (patch)
tree959c70a615dcbb9034581e72aec8fd2964718e61 /source3
parent569c8700d6394c88fd706b46248c08279fdfb203 (diff)
downloadsamba-6fdbf8de87521ea6f08cda6edf7129bdb6987968.tar.gz
samba-6fdbf8de87521ea6f08cda6edf7129bdb6987968.tar.xz
samba-6fdbf8de87521ea6f08cda6edf7129bdb6987968.zip
lib: Fix CID 1128561 Pointer to local outside scope
This is not strictly a bug, but it is confusing enough to justify a small patch I guess. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/ctdbd_conn.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 3cedf7e4e2..204aba5665 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1304,6 +1304,7 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn,
{
NTSTATUS status;
TDB_DATA data;
+ TDB_DATA rdata = {0};
int32_t cstatus = 0;
data.dptr = (uint8_t*)&db_id;
@@ -1311,13 +1312,13 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn,
status = ctdbd_control(conn, CTDB_CURRENT_NODE,
CTDB_CONTROL_GETDBPATH, 0, 0, data,
- mem_ctx, &data, &cstatus);
+ mem_ctx, &rdata, &cstatus);
if (!NT_STATUS_IS_OK(status) || cstatus != 0) {
DEBUG(0,(__location__ " ctdb_control for getdbpath failed\n"));
return NULL;
}
- return (char *)data.dptr;
+ return (char *)rdata.dptr;
}
/*