Attachment 5262 Details for Bug 7063 – git-am fix for 3.4.6.

git-am fix for 3.4.6.

0001-Fix-bug-7063-Samba-3.4.5-on-ubuntu-8.04-64-bit-Core-.patch (text/x-diff), 1.21 KB, created by Jeremy Allison on 2010-02-02 18:40:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-02-02 18:40:15 UTC

Size: 1.21 KB

patch

obsolete

>From 87ce56b1edf8548f14081f70e392be15efd7a2d3 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 2 Feb 2010 16:38:40 -0800
>Subject: [PATCH] Fix bug 7063 - Samba 3.4.5 on ubuntu 8.04 64 bit - Core dumps.
>
>Reported and found by Martin Hochreiter <linuxbox@wavenet.at>.
>Ensure we copy the right amount of registry data into the outgoing
>buffer.
>
>Jeremy.
>---
> source3/rpc_server/srv_spoolss_nt.c |   11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
>index e88c733..30b6051 100644
>--- a/source3/rpc_server/srv_spoolss_nt.c
>+++ b/source3/rpc_server/srv_spoolss_nt.c
>@@ -8073,8 +8073,15 @@ WERROR _spoolss_EnumPrinterData(pipes_struct *p,
> 
> 		/* data - counted in bytes */
> 
>-		if (r->out.data && regval_size(val)) {
>-			memcpy(r->out.data, regval_data_p(val), regval_size(val));
>+		/*
>+		 * See the section "Dynamically Typed Query Parameters"
>+ 		 * in MS-RPRN.
>+ 		 */
>+
>+		if (r->out.data && regval_data_p(val) &&
>+				regval_size(val) && r->in.data_offered) {
>+			memcpy(r->out.data, regval_data_p(val),
>+				MIN(regval_size(val),r->in.data_offered));
> 		}
> 
> 		*r->out.data_needed = regval_size(val);
>-- 
>1.6.6
>

Flags:

jra: review? (gd)

Actions: View

Attachments on bug 7063: 5259 | 5260 | 5261 | 5262 | 5303