Attachment 4373 Details for Bug 6512 – enumform spoolss crash fix

[patch] enumform spoolss crash fix

spoolss.patch (text/plain), 1.53 KB, created by Guenther Deschner on 2009-06-30 06:51:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2009-06-30 06:51:58 UTC

Size: 1.53 KB

patch

obsolete

>From b85b93dcff89e18bd15d4cef8b8c2dc61bc42cbe Mon Sep 17 00:00:00 2001
>From: =?utf-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Tue, 30 Jun 2009 13:12:01 +0200
>Subject: [PATCH] s3-spoolss: Bug #6512. Fix support for enumerating user forms.
>
>Found while testing Xerox WorkCentre 133 PCL driver, now also tested with
>torture test.
>
>Guenther
>---
> source3/rpc_server/srv_spoolss_nt.c |   10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
>index 899fed2..1ea92b4 100644
>--- a/source3/rpc_server/srv_spoolss_nt.c
>+++ b/source3/rpc_server/srv_spoolss_nt.c
>@@ -7087,7 +7087,7 @@ static WERROR spoolss_enumforms_level1(TALLOC_CTX *mem_ctx,
> 
> 	/* construct the list of form structures */
> 	for (i=0; i<num_builtin_forms; i++) {
>-		DEBUGADD(6,("Filling form number [%d]\n",i));
>+		DEBUGADD(6,("Filling builtin form number [%d]\n",i));
> 		result = fill_form_info_1(info, &info[i].info1,
> 					  &builtin_forms[i]);
> 		if (!W_ERROR_IS_OK(result)) {
>@@ -7095,10 +7095,10 @@ static WERROR spoolss_enumforms_level1(TALLOC_CTX *mem_ctx,
> 		}
> 	}
> 
>-	for (; i<num_user_forms; i++) {
>-		DEBUGADD(6,("Filling form number [%d]\n",i));
>-		result = fill_form_info_1(info, &info[i].info1,
>-					  &user_forms[i-num_builtin_forms]);
>+	for (i=0; i<num_user_forms; i++) {
>+		DEBUGADD(6,("Filling user form number [%d]\n",i));
>+		result = fill_form_info_1(info, &info[i+num_builtin_forms].info1,
>+					  &user_forms[i]);
> 		if (!W_ERROR_IS_OK(result)) {
> 			goto out;
> 		}
>-- 
>1.6.2.5
>

Flags:

vl: review+

Actions: View

Attachments on bug 6512: 4373