[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  fb3ddb4 ctdb-common: replace talloc / memcpy by talloc_memdup
      from  5e89a23 krb5_plugin: Add winbind localauth plugin for MIT Kerberos

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fb3ddb48741e9e9699cf6efab70192a45f49573e
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Wed Mar 7 14:40:33 2018 +0100

    ctdb-common: replace talloc / memcpy by talloc_memdup
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Fri Jun 22 11:57:19 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 ctdb/common/ctdb_io.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index 3e732e8..c694124 100644
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -117,12 +117,11 @@ static void queue_process(struct ctdb_queue *queue)
 	}
 
 	/* Extract complete packet */
-	data = talloc_size(queue, pkt_size);
+	data = talloc_memdup(queue, queue->buffer.data, pkt_size);
 	if (data == NULL) {
-		DEBUG(DEBUG_ERR, ("read error alloc failed for %u\n", pkt_size));
+		D_ERR("read error alloc failed for %u\n", pkt_size);
 		return;
 	}
-	memcpy(data, queue->buffer.data, pkt_size);
 
 	/* Shift packet out from buffer */
 	if (queue->buffer.length > pkt_size) {


-- 
Samba Shared Repository