Merge branch 'master' of ssh://git.samba.org/data/git/samba

1 files changed, 27 insertions, 17 deletions

diff --git a/source3/lib/packet.c b/source3/lib/packet.c
index e4cab6ba87..ef28bf9f62 100644
--- a/source3/lib/packet.c
+++ b/source3/lib/packet.c
@@ -120,33 +120,43 @@ NTSTATUS packet_fd_read_sync(struct packet_context *ctx)
 }
 
 bool packet_handler(struct packet_context *ctx,
-		    bool (*full_req)(const DATA_BLOB *data,
+		    bool (*full_req)(const uint8_t *buf,
+				     size_t available,
 				     size_t *length,
-				     void *private_data),
-		    NTSTATUS (*callback)(const DATA_BLOB *data,
-					 void *private_data),
-		    void *private_data,
-		    NTSTATUS *status)
+				     void *priv),
+		    NTSTATUS (*callback)(uint8_t *buf, size_t length,
+					 void *priv),
+		    void *priv, NTSTATUS *status)
 {
 	size_t length;
-	DATA_BLOB data;
+	uint8_t *buf;
 
-	if (!full_req(&ctx->in, &length, private_data)) {
+	if (!full_req(ctx->in.data, ctx->in.length, &length, priv)) {
 		return False;
 	}
 
-	SMB_ASSERT(length <= ctx->in.length);
-
-	data = data_blob(ctx->in.data, length);
-
-	memmove(ctx->in.data, ctx->in.data + length,
-		ctx->in.length - length);
-	ctx->in.length -= length;
+	if (length > ctx->in.length) {
+		*status = NT_STATUS_INTERNAL_ERROR;
+		return true;
+	}
 
-	*status = callback(&data, private_data);
+	if (length == ctx->in.length) {
+		buf = ctx->in.data;
+		ctx->in.data = NULL;
+		ctx->in.length = 0;
+	} else {
+		buf = (uint8_t *)TALLOC_MEMDUP(ctx, ctx->in.data, length);
+		if (buf == NULL) {
+			*status = NT_STATUS_NO_MEMORY;
+			return true;
+		}
 
-	data_blob_free(&data);
+		memmove(ctx->in.data, ctx->in.data + length,
+			ctx->in.length - length);
+		ctx->in.length -= length;
+	}
 
+	*status = callback(buf, length, priv);
 	return True;
 }